Merge branch 'master' of https://gitee.com/diego2098/ThingsGateway

2023-03-19 16:34:26 +08:00
parent 0c4cd56758 4a36658321
commit bdfbbfcbbd
4 changed files with 4 additions and 3 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/src/ThingsGateway.Core/ThingsGateway.Core.csproj
+++ b/src/ThingsGateway.Core/ThingsGateway.Core.csproj
@@ -15,6 +15,7 @@
 		<PackageReference Include="NewLife.Core" Version="10.2.2023.301" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.4" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.11" />
--- a/src/ThingsGateway.Web.Server/Properties/launchSettings.json
+++ b/src/ThingsGateway.Web.Server/Properties/launchSettings.json
@@ -1,14 +1,13 @@
 {
-
  "profiles": {
    "Kestrel": {
      "commandName": "Project",
      "launchBrowser": true,
+      "applicationUrl": "http://localhost:7100;https://localhost:7101",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:7100;https://localhost:7101"
+      "dotnetRunMessages": true
    }
  }
 }
--- a/src/ThingsGateway.Web.Server/ThingsGateway.Web.Server.csproj
+++ b/src/ThingsGateway.Web.Server/ThingsGateway.Web.Server.csproj
@@ -16,6 +16,7 @@



+	<PropertyGroup Condition=" '$(RunConfiguration)' == 'Kestrel' " />
 	<ItemGroup>
 	  <ProjectReference Include="..\ThingsGateway.Web.Core\ThingsGateway.Web.Core.csproj" />
 	</ItemGroup>