Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions AspNetCore/Vue3/AdvancedSearch.Server/AdvancedSearch.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<SpaRoot>..\AdvancedSearch.Client</SpaRoot>
Expand All @@ -13,18 +13,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaProxy">
<Version>6.*-*</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.26" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.26" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.26" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Korzh.DbUtils.Import" Version="1.4.1" />
Expand All @@ -42,4 +33,4 @@
<PackageReference Include="Korzh.EasyQuery.SqLiteGate" Version="7.4.0" />
<PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.4.0" />
</ItemGroup>
</Project>
</Project>
20 changes: 1 addition & 19 deletions AspNetCore/Vue3/AdvancedSearch.Server/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

app.UseHttpsRedirection();
app.UseStaticFiles();
//if (!env.IsDevelopment()) {
// app.UseSpaStaticFiles();
//}


app.UseRouting();

app.UseEndpoints(endpoints =>
Expand Down Expand Up @@ -108,21 +105,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
endpoints.MapControllers();
});

//app.UseSpa(spa => {

// spa.Options.SourcePath = "ClientApp";
// spa.Options.StartupTimeout = TimeSpan.FromMinutes(2);

// if (env.IsDevelopment()) {
// // run npm process with client app
// spa.UseVueCli(npmScript: "dev", port: 8086, regex: "vite");
// // if you just prefer to proxy requests from client app, use proxy to SPA dev server instead:
// // app should be already running before starting a .NET client
// spa.UseProxyToSpaDevelopmentServer("http://localhost:8086"); // your Vue app port
// }
//});


//Init demo database (if necessary)
app.EnsureDbInitialized(Configuration, env);
}
Expand Down