Skip to content

Commit 13340b5

Browse files
jason-aelfjason-aelf
authored
Merge pull request #2 from AElfProject/dev
Merge aelf dev
2 parents 91eed51 + 46a4c5d commit 13340b5

2,032 files changed

Lines changed: 129039 additions & 127754 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: csharp
22
sudo: required
33
mono: none
4-
dotnet: 3.1.102
4+
dotnet: 6.0.300
55
dist: xenial
66
os:
77
- linux

‎AElf.All.sln‎

Lines changed: 1242 additions & 0 deletions
Large diffs are not rendered by default.

‎AElf.Contracts.sln‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contract", "contract", "{651F0F6E-86CF-42D2-9110-5F3EAE5704F0}"
4+
EndProject
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{26990847-E0A2-4FCC-8C71-267CA77557CD}"
6+
EndProject
7+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{51CE1A9E-63A0-49C6-B820-C8519C94F389}"
8+
EndProject
9+
Global
10+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
11+
Debug|Any CPU = Debug|Any CPU
12+
Release|Any CPU = Release|Any CPU
13+
EndGlobalSection
14+
EndGlobal

‎AElf.sln‎

Lines changed: 646 additions & 1085 deletions
Large diffs are not rendered by default.

‎AElf.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/CodeEditing/SuppressNullableWarningFix/Enabled/@EntryValue">False</s:Boolean>
23
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JS/@EntryIndexedValue">JS</s:String>
34
<s:Boolean x:Key="/Default/UserDictionary/Words/=aelf/@EntryIndexedValue">True</s:Boolean>
45
<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="src\AElf.ContractDeployer\AElf.ContractDeployer.targets" />
4-
<Import Project="AElf.ContractTools.targets" />
3+
<Import Project="src\AElf.ContractDeployer\AElf.ContractDeployer.targets"/>
4+
<Import Project="AElf.ContractTools.targets"/>
55
</Project>

‎azure-pipelines.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
- task: UseDotNet@2
1212
displayName: 'Install .NET Core SDK'
1313
inputs:
14-
version: 3.1.102
15-
- script: choco install protoc --version=3.11.4 -y
14+
version: 6.0.x
15+
- script: choco install protoc --version=3.19.4 -y
1616
displayName: 'Install protobuf'
1717
- script: choco install unzip
1818
displayName: 'Install unzip'
@@ -47,7 +47,7 @@ jobs:
4747
- task: UseDotNet@2
4848
displayName: 'Install .NET Core SDK'
4949
inputs:
50-
version: 3.1.102
50+
version: 6.0.x
5151
- script: bash scripts/install_protobuf.sh
5252
- script: bash scripts/download_binary.sh
5353
- script: bash build.sh -target=Test-with-Codecov-N --parts=3 --n=2
@@ -80,7 +80,7 @@ jobs:
8080
- task: UseDotNet@2
8181
displayName: 'Install .NET Core SDK'
8282
inputs:
83-
version: 3.1.102
83+
version: 6.0.x
8484
- script: bash scripts/install_protobuf.sh
8585
- script: bash scripts/download_binary.sh
8686
- script: bash build.sh -target=Test-with-Codecov-N --parts=3 --n=3
@@ -99,4 +99,4 @@ jobs:
9999
reporttypes: 'Cobertura'
100100
assemblyfilters: '-xunit*'
101101
- script: bash build.sh -target=Upload-Coverage-Azure
102-
displayName: 'Upload data to Codecov'
102+
displayName: 'Upload data to Codecov'

‎bench/AElf.BenchBase/AElf.BenchBase.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Pro.NBench.xUnit" Version="2.0.0" />
9+
<PackageReference Include="Pro.NBench.xUnit" Version="2.0.0"/>
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<ProjectReference Include="..\..\test\AElf.TestBase\AElf.TestBase.csproj" />
13+
<ProjectReference Include="..\..\test\AElf.TestBase\AElf.TestBase.csproj"/>
1414
</ItemGroup>
1515

1616
</Project>

‎bench/AElf.BenchBase/Assembly.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
using Xunit;
22

3-
[assembly: CollectionBehavior(DisableTestParallelization = true)]
3+
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎bench/AElf.BenchBase/BenchBaseAElfModule.cs‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@
22
using AElf.TestBase;
33
using Volo.Abp.Modularity;
44

5-
namespace AElf.BenchBase
5+
namespace AElf.BenchBase;
6+
7+
[DependsOn(typeof(TestBaseAElfModule))]
8+
public class BenchBaseAElfModule : AElfModule
9+
{
10+
}
11+
12+
public class BenchBaseTest<TModule> : AElfIntegratedTest<TModule>
13+
where TModule : IAbpModule
614
{
7-
[DependsOn(typeof(TestBaseAElfModule))]
8-
public class BenchBaseAElfModule : AElfModule
9-
{
10-
11-
}
12-
13-
public class BenchBaseTest<TModule> : AElfIntegratedTest<TModule>
14-
where TModule: IAbpModule
15-
{
16-
}
15+
}
1716

18-
public class BenchBaseTest : AElfIntegratedTest<TestBaseAElfModule>
19-
{
20-
21-
}
17+
public class BenchBaseTest : AElfIntegratedTest<TestBaseAElfModule>
18+
{
2219
}

0 commit comments

Comments
 (0)