fix merge conflicts

sillsdev · Nov 29, 2024 · 44ed456 · 44ed456
1 parent 847610b
commit 44ed456
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/backend/FwLite/FwLiteProjectSync.Tests/Fixtures/Sena3SyncFixture.cs b/backend/FwLite/FwLiteProjectSync.Tests/Fixtures/Sena3SyncFixture.cs
@@ -54,7 +54,7 @@ public async Task InitializeAsync()
         File.Move(Path.Combine(fwDataProjectPath, "sena-3.fwdata"), fwDataProject.FilePath);
         var fwDataMiniLcmApi = services.GetRequiredService<FwDataFactory>().GetFwDataMiniLcmApi(fwDataProject, false);
 
-        var crdtProject = await services.GetRequiredService<ProjectsService>()
+        var crdtProject = await services.GetRequiredService<CrdtProjectsService>()
             .CreateProject(new(projectName, FwProjectId: fwDataMiniLcmApi.ProjectId, SeedNewProjectData: false));
         var crdtMiniLcmApi = (CrdtMiniLcmApi)await services.OpenCrdtProject(crdtProject);
         return (crdtMiniLcmApi, fwDataMiniLcmApi, services, cleanup);

diff --git a/backend/FwLite/FwLiteShared/FwLiteShared.csproj b/backend/FwLite/FwLiteShared/FwLiteShared.csproj
@@ -1,24 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Humanizer.Core" Version="2.14.1"/>
-      <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-      <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
-      <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.64.0"/>
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.64.0"/>
         <PackageReference Include="System.Reactive" Version="6.0.1"/>
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\FwDataMiniLcmBridge\FwDataMiniLcmBridge.csproj" />
-      <ProjectReference Include="..\FwLiteProjectSync\FwLiteProjectSync.csproj" />
-      <ProjectReference Include="..\LcmCrdt\LcmCrdt.csproj" />
+        <ProjectReference Include="..\FwDataMiniLcmBridge\FwDataMiniLcmBridge.csproj"/>
+        <ProjectReference Include="..\FwLiteProjectSync\FwLiteProjectSync.csproj"/>
+        <ProjectReference Include="..\LcmCrdt\LcmCrdt.csproj"/>
     </ItemGroup>
 
 </Project>