Browse Source

App reserveration fixed.

pull/349/head
Sebastian Stehle 7 years ago
parent
commit
4234d5be88
  1. 2
      src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  2. 2
      src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs
  3. 2
      src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  4. 4
      src/Squidex/Squidex.csproj
  5. 2
      tests/RunCoverage.ps1
  6. 2
      tests/Squidex.Tests/Squidex.Tests.csproj

2
src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="Jint" Version="3.0.0-beta-1469" />
<PackageReference Include="Microsoft.OData.Core" Version="7.5.4" />
<PackageReference Include="NJsonSchema" Version="9.13.18" />
<PackageReference Include="NJsonSchema" Version="9.13.19" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />

2
src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs

@ -53,7 +53,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Indexes
private bool IsInUse(Guid appId, string name)
{
return State.Apps.ContainsKey(name) || State.Apps.All(x => x.Value == appId);
return State.Apps.ContainsKey(name) || State.Apps.Any(x => x.Value == appId);
}
private bool IsReserved(Guid appId, string name)

2
src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -27,7 +27,7 @@
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Reactive" Version="4.1.2" />
<PackageReference Include="System.Reactive" Version="4.1.3" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />

4
src/Squidex/Squidex.csproj

@ -86,13 +86,13 @@
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.2.3" />
<PackageReference Include="MongoDB.Driver" Version="2.7.3" />
<PackageReference Include="NJsonSchema" Version="9.13.18" />
<PackageReference Include="NJsonSchema" Version="9.13.19" />
<PackageReference Include="NSwag.AspNetCore" Version="12.0.14" />
<PackageReference Include="OpenCover" Version="4.7.922" />
<PackageReference Include="Orleans.Providers.MongoDB" Version="2.0.2" />
<PackageReference Include="OrleansDashboard" Version="2.2.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.0.12" />
<PackageReference Include="ReportGenerator" Version="4.0.13.1" />
<PackageReference Include="Squidex.ClientLibrary" Version="2.8.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Linq" Version="4.3.0" />

2
tests/RunCoverage.ps1

@ -76,6 +76,6 @@ if ($all -Or $web) {
-oldStyle
}
&"$folderHome\.nuget\packages\ReportGenerator\4.0.9\tools\net47\ReportGenerator.exe" `
&"$folderHome\.nuget\packages\ReportGenerator\4.0.13.1\tools\net47\ReportGenerator.exe" `
-reports:"$folderWorking\$folderReports\*.xml" `
-targetdir:"$folderWorking\$folderReports\Output"

2
tests/Squidex.Tests/Squidex.Tests.csproj

@ -16,7 +16,7 @@
<PackageReference Include="IdentityServer4" Version="2.3.2" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NJsonSchema" Version="9.13.18" />
<PackageReference Include="NJsonSchema" Version="9.13.19" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.1" />

Loading…
Cancel
Save