forked from easyquery/DotNetSamples
-
Notifications
You must be signed in to change notification settings - Fork 0
Upgrade Stencil AdvancedSearch sample to .NET 8 #36
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
devin-ai-integration
wants to merge
2
commits into
master
Choose a base branch
from
devin/1777991025-net8-stencil-advsearch
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
141 changes: 69 additions & 72 deletions
141
AspNetCore/Stencil/AdvancedSearch/EqDemo.AspNetCoreStencil.AdvancedSearch.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,69 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> | ||
| <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> | ||
| <IsPackable>false</IsPackable> | ||
| <SpaRoot>ClientApp\</SpaRoot> | ||
| <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes> | ||
| <UserSecretsId>EqDemo.AspNetCoreStencil.AdvancedSearch</UserSecretsId> | ||
| <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" /> | ||
| <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.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="Microsoft.IdentityModel.JsonWebTokens" Version="6.34.0" /> | ||
| <PackageReference Include="System.Data.SqlClient" Version="4.8.6" /> | ||
| <PackageReference Include="System.Drawing.Common" Version="4.7.2" /> | ||
| <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" /> | ||
| <PackageReference Include="System.Net.Http" Version="4.3.4" /> | ||
| <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" /> | ||
| <PackageReference Include="VueCliMiddleware" Version="6.0.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- DB initialization packages. They are not necessary for EasyQuery working and can be removed in production --> | ||
| <PackageReference Include="Korzh.DbUtils.Import" Version="1.4.1" /> | ||
| <PackageReference Include="Korzh.DbUtils.SqlServer" Version="1.4.1" /> | ||
| <PackageReference Include="Korzh.DbUtils.Sqlite" Version="1.4.1" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.5.9" /> | ||
| <PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.5.9" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Korzh.EasyQuery.AspNetCore" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.EntityFrameworkCore.Relational" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.SqlServerGate" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.SqLiteGate" Version="7.4.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- Don't publish the SPA source files, but do show them in the project files list --> | ||
| <Content Remove="$(SpaRoot)**" /> | ||
| <None Remove="$(SpaRoot)**" /> | ||
| <None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" /> | ||
| </ItemGroup> | ||
| <Target Name="DebugEnsureNodeEnv" BeforeTargets="PreBuildEvent" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') "> | ||
| <!-- Ensure Node.js is installed --> | ||
| <Exec Command="node --version" ContinueOnError="true"> | ||
| <Output TaskParameter="ExitCode" PropertyName="ErrorCode" /> | ||
| </Exec> | ||
| <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." /> | ||
| <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." /> | ||
| <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> | ||
| </Target> | ||
| <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish"> | ||
| <!-- As part of publishing, ensure the JS resources are freshly built in production mode --> | ||
| <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> | ||
| <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" /> | ||
| <!-- Include the newly-built files in the publish output --> | ||
| <ItemGroup> | ||
| <DistFiles Include="$(SpaRoot)build\**" /> | ||
| <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)"> | ||
| <RelativePath>%(DistFiles.Identity)</RelativePath> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | ||
| <ExcludeFromSingleFile>true</ExcludeFromSingleFile> | ||
| </ResolvedFileToPublish> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> | ||
| <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> | ||
| <IsPackable>false</IsPackable> | ||
| <SpaRoot>ClientApp\</SpaRoot> | ||
| <SpaProxyServerUrl>http://localhost:4444</SpaProxyServerUrl> | ||
| <SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand> | ||
| <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes> | ||
| <UserSecretsId>EqDemo.AspNetCoreStencil.AdvancedSearch</UserSecretsId> | ||
| <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.26" /> | ||
| <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.3" /> | ||
| <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.26" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.26" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.26" /> | ||
| <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.7.1" /> | ||
| <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.7.1" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- DB initialization packages. They are not necessary for EasyQuery working and can be removed in production --> | ||
| <PackageReference Include="Korzh.DbUtils.Import" Version="1.4.1" /> | ||
| <PackageReference Include="Korzh.DbUtils.SqlServer" Version="1.4.1" /> | ||
| <PackageReference Include="Korzh.DbUtils.Sqlite" Version="1.4.1" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.5.9" /> | ||
| <PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.5.9" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Korzh.EasyQuery.AspNetCore" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.EntityFrameworkCore.Relational" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.SqlServerGate" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.4.0" /> | ||
| <PackageReference Include="Korzh.EasyQuery.SqLiteGate" Version="7.4.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- Don't publish the SPA source files, but do show them in the project files list --> | ||
| <Content Remove="$(SpaRoot)**" /> | ||
| <None Remove="$(SpaRoot)**" /> | ||
| <None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" /> | ||
| </ItemGroup> | ||
| <Target Name="DebugEnsureNodeEnv" BeforeTargets="PreBuildEvent" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') "> | ||
| <!-- Ensure Node.js is installed --> | ||
| <Exec Command="node --version" ContinueOnError="true"> | ||
| <Output TaskParameter="ExitCode" PropertyName="ErrorCode" /> | ||
| </Exec> | ||
| <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." /> | ||
| <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." /> | ||
| <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> | ||
| </Target> | ||
| <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish"> | ||
| <!-- As part of publishing, ensure the JS resources are freshly built in production mode --> | ||
| <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> | ||
| <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" /> | ||
| <!-- Include the newly-built files in the publish output under wwwroot --> | ||
| <ItemGroup> | ||
| <DistFiles Include="$(SpaRoot)www\**" /> | ||
| <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)"> | ||
| <RelativePath>wwwroot\%(RecursiveDir)%(FileName)%(Extension)</RelativePath> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | ||
| <ExcludeFromSingleFile>true</ExcludeFromSingleFile> | ||
| </ResolvedFileToPublish> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.