Просмотр исходного кода

Merge branch 'master' into develop-rc

CrazyIter_Bin 2 лет назад
Родитель
Сommit
b03c100011
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 1
      TEAMModelOS.SDK/TEAMModelOS.SDK.csproj
  2. 3 0
      TEAMModelOS/TEAMModelOS.csproj

+ 1 - 1
TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.3" />
     <PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.18.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.7" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.39.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
     <PackageReference Include="NUnit" Version="3.13.2" />

+ 3 - 0
TEAMModelOS/TEAMModelOS.csproj

@@ -31,6 +31,9 @@
     </Reference>
   </ItemGroup>
 	<ItemGroup>
+		<None Update="JsonFile\Core\ip2region.db">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="libwkhtmltox.dll">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>