tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fody fixed.

pull/502/head
Sebastian 6 years ago
parent
59f87bb49b
commit
19676e47f3
11 changed files with 30 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
  2. 2
      backend/src/Squidex.Domain.Apps.Core.Model/FodyWeavers.xml
  3. 2
      backend/src/Squidex.Domain.Apps.Core.Model/FodyWeavers.xsd
  4. 6
      backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
  5. 2
      backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  6. 10
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  7. 2
      backend/src/Squidex.Infrastructure.Amazon/Squidex.Infrastructure.Amazon.csproj
  8. 2
      backend/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj
  9. 16
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  10. 12
      backend/src/Squidex/Squidex.csproj
  11. 2
      backend/tools/Benchmarks/Benchmarks.csproj

4
backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
View File

@ -11,8 +11,8 @@
<PackageReference Include="Algolia.Search" Version="6.5.1" /> <PackageReference Include="Algolia.Search" Version="6.5.1" />
<PackageReference Include="Confluent.Kafka" Version="1.3.0" /> <PackageReference Include="Confluent.Kafka" Version="1.3.0" />
<PackageReference Include="CoreTweet" Version="1.0.0.483" /> <PackageReference Include="CoreTweet" Version="1.0.0.483" />
<PackageReference Include="Datadog.Trace" Version="1.13.2" /> <PackageReference Include="Datadog.Trace" Version="1.14.2" />
<PackageReference Include="Elasticsearch.Net" Version="7.6.0" /> <PackageReference Include="Elasticsearch.Net" Version="7.6.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.6.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

2
backend/src/Squidex.Domain.Apps.Core.Model/FodyWeavers.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"> <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Freezable /> <SquidexFreezable />
<Equals /> <Equals />
</Weavers> </Weavers>

2
backend/src/Squidex.Domain.Apps.Core.Model/FodyWeavers.xsd
View File

@ -4,8 +4,8 @@
<xs:element name="Weavers"> <xs:element name="Weavers">
<xs:complexType> <xs:complexType>
<xs:all> <xs:all>
<xs:element name="SquidexFreezable" minOccurs="0" maxOccurs="1" type="xs:anyType" />
<xs:element name="Equals" minOccurs="0" maxOccurs="1" type="xs:anyType" /> <xs:element name="Equals" minOccurs="0" maxOccurs="1" type="xs:anyType" />
<xs:element name="Freezable" minOccurs="0" maxOccurs="1" type="xs:anyType" />
</xs:all> </xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean"> <xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation> <xs:annotation>

6
backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
View File

@ -10,12 +10,12 @@
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Equals.Fody" Version="1.9.5" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="4.2.1"> <PackageReference Include="Fody" Version="6.1.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Freezable.Fody" Version="1.9.3" PrivateAssets="all" /> <PackageReference Include="SquidexFreezable.Fody" Version="2.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
View File

@ -19,7 +19,7 @@
<PackageReference Include="Jint" Version="3.0.0-beta-1580" /> <PackageReference Include="Jint" Version="3.0.0-beta-1580" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.6.3" />
<PackageReference Include="NJsonSchema" Version="10.1.5" /> <PackageReference Include="NJsonSchema" Version="10.1.8" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />

10
backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
View File

@ -17,9 +17,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CsvHelper" Version="15.0.1" /> <PackageReference Include="CsvHelper" Version="15.0.1" />
<PackageReference Include="Elasticsearch.Net" Version="7.6.0" /> <PackageReference Include="Elasticsearch.Net" Version="7.6.1" />
<PackageReference Include="Equals.Fody" Version="1.9.5" allowedVersions="[1.9.5]" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="4.2.1" allowedVersions="[4.2.1]"> <PackageReference Include="Fody" Version="6.1.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@ -29,11 +29,11 @@
<PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00005" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00005" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.2"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.2" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.3" />
<PackageReference Include="NodaTime" Version="2.4.7" /> <PackageReference Include="NodaTime" Version="2.4.7" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
backend/src/Squidex.Infrastructure.Amazon/Squidex.Infrastructure.Amazon.csproj
View File

@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="3.3.110.30" /> <PackageReference Include="AWSSDK.S3" Version="3.3.110.34" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
</ItemGroup> </ItemGroup>

2
backend/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.2.8" /> <PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.2.8" />
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.10.0" /> <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.10.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" /> <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />

16
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
View File

@ -9,26 +9,26 @@
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Equals.Fody" Version="1.9.5" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="FluentFTP" Version="32.1.0" /> <PackageReference Include="FluentFTP" Version="32.2.2" />
<PackageReference Include="Fody" Version="4.2.1"> <PackageReference Include="Fody" Version="6.1.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.1.0" /> <PackageReference Include="McMaster.NETCore.Plugins" Version="1.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.2" /> <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.2" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.6.3" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.2"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.2" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.2" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NJsonSchema" Version="10.1.5" /> <PackageReference Include="NJsonSchema" Version="10.1.8" />
<PackageReference Include="NodaTime" Version="2.4.7" /> <PackageReference Include="NodaTime" Version="2.4.7" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />

12
backend/src/Squidex/Squidex.csproj
View File

@ -45,19 +45,19 @@
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" /> <PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.6.3" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.2" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.2" /> <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.2" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.3" />
<PackageReference Include="MongoDB.Driver" Version="2.10.2" /> <PackageReference Include="MongoDB.Driver" Version="2.10.2" />
<PackageReference Include="Namotion.Reflection" Version="1.0.10" /> <PackageReference Include="Namotion.Reflection" Version="1.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NJsonSchema" Version="10.1.5" /> <PackageReference Include="NJsonSchema" Version="10.1.8" />
<PackageReference Include="NSwag.AspNetCore" Version="13.2.3" /> <PackageReference Include="NSwag.AspNetCore" Version="13.2.5" />
<PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" /> <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" />
<PackageReference Include="Orleans.Providers.MongoDB" Version="3.1.1" /> <PackageReference Include="Orleans.Providers.MongoDB" Version="3.1.1" />
<PackageReference Include="OrleansDashboard" Version="3.0.8" /> <PackageReference Include="OrleansDashboard" Version="3.0.8" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.5.0" PrivateAssets="all" /> <PackageReference Include="ReportGenerator" Version="4.5.2" PrivateAssets="all" />
<PackageReference Include="Squidex.ClientLibrary" Version="4.2.0" /> <PackageReference Include="Squidex.ClientLibrary" Version="4.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Linq" Version="4.3.0" /> <PackageReference Include="System.Linq" Version="4.3.0" />

2
backend/tools/Benchmarks/Benchmarks.csproj
View File

@ -6,7 +6,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.12.0" /> <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
<PackageReference Include="Lorem.Universal.Net" Version="3.0.64" /> <PackageReference Include="Lorem.Universal.Net" Version="3.0.64" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.2" /> <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.3" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
</ItemGroup> </ItemGroup>

Write Preview
Loading…
Cancel
Save