Browse Source

Merge pull request #7358 from abpframework/auto-merge/rel-4-2/109

Merge branch dev with rel-4.2
pull/7362/head
maliming 6 years ago
committed by GitHub
parent
commit
053881b31b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      docs/en/UI/Angular/Testing.md
  2. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

4
docs/en/UI/Angular/Testing.md

@ -374,3 +374,7 @@ Finally, don't forget to run your CI tests with the following command:
```sh
npm test -- --prod
```
## See Also
* [ABP Community Video - Unit Testing with the Angular UI](https://community.abp.io/articles/unit-testing-with-the-angular-ui-p4l550q3)

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@ -248,7 +248,7 @@ namespace Volo.Abp.Cli.Commands
case DatabaseManagementSystem.OracleDevart:
return "Data Source=MyProjectName;Integrated Security=yes;";
case DatabaseManagementSystem.SQLite:
return $"Data Source={Path.Combine(outputFolder,"database\\MyProjectName.db")};Version=3;";
return $"Data Source={Path.Combine(outputFolder , "MyProjectName.db")};".Replace("\\", "\\\\");
default:
return null;
}

Loading…
Cancel
Save