Skip to content

Commit

Permalink
Merge pull request #3350 from AElfProject/release/1.2.2
Browse files Browse the repository at this point in the history
Release v1.2.2
  • Loading branch information
jason-aelf authored Dec 27, 2022
2 parents 69cc24e + 7cff643 commit c57e2ee
Show file tree
Hide file tree
Showing 176 changed files with 5,865 additions and 7,492 deletions.
14 changes: 0 additions & 14 deletions AElf.All.sln
Original file line number Diff line number Diff line change
Expand Up @@ -359,14 +359,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.ContractDeployer.Tests
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Contracts.NFT", "contract\AElf.Contracts.NFT\AElf.Contracts.NFT.csproj", "{0ECCF46E-3989-4A7E-BA31-4E73D7515578}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Contracts.NFTMarket", "contract\AElf.Contracts.NFTMarket\AElf.Contracts.NFTMarket.csproj", "{4F0FEB76-5EB6-4AFC-9222-21DD22884A3B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Contracts.NFT.Tests", "test\AElf.Contracts.NFT.Tests\AElf.Contracts.NFT.Tests.csproj", "{7E07BD13-74BF-4FD7-A294-07E664C47100}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Contracts.TestContract.BigIntValue", "test\AElf.Contracts.TestContract.BigIntValue\AElf.Contracts.TestContract.BigIntValue.csproj", "{F50AF512-69E2-46B5-87C6-E058CE2C2D8A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Contracts.NFTMinter", "contract\AElf.Contracts.NFTMinter\AElf.Contracts.NFTMinter.csproj", "{1C0833AE-18DB-4E62-BB0A-226F4555CB09}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Kernel.FeatureManager", "src\AElf.Kernel.FeatureManager\AElf.Kernel.FeatureManager.csproj", "{B24BC602-DAFD-4941-A913-8B0725691681}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Kernel.FeatureManager.Tests", "test\AElf.Kernel.FeatureManager.Tests\AElf.Kernel.FeatureManager.Tests.csproj", "{1B44277E-74EB-49B2-B8FD-05C29EE51985}"
Expand Down Expand Up @@ -1041,10 +1037,6 @@ Global
{0ECCF46E-3989-4A7E-BA31-4E73D7515578}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0ECCF46E-3989-4A7E-BA31-4E73D7515578}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0ECCF46E-3989-4A7E-BA31-4E73D7515578}.Release|Any CPU.Build.0 = Release|Any CPU
{4F0FEB76-5EB6-4AFC-9222-21DD22884A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F0FEB76-5EB6-4AFC-9222-21DD22884A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F0FEB76-5EB6-4AFC-9222-21DD22884A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F0FEB76-5EB6-4AFC-9222-21DD22884A3B}.Release|Any CPU.Build.0 = Release|Any CPU
{7E07BD13-74BF-4FD7-A294-07E664C47100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E07BD13-74BF-4FD7-A294-07E664C47100}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E07BD13-74BF-4FD7-A294-07E664C47100}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -1053,10 +1045,6 @@ Global
{F50AF512-69E2-46B5-87C6-E058CE2C2D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F50AF512-69E2-46B5-87C6-E058CE2C2D8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F50AF512-69E2-46B5-87C6-E058CE2C2D8A}.Release|Any CPU.Build.0 = Release|Any CPU
{1C0833AE-18DB-4E62-BB0A-226F4555CB09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C0833AE-18DB-4E62-BB0A-226F4555CB09}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C0833AE-18DB-4E62-BB0A-226F4555CB09}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C0833AE-18DB-4E62-BB0A-226F4555CB09}.Release|Any CPU.Build.0 = Release|Any CPU
{B24BC602-DAFD-4941-A913-8B0725691681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B24BC602-DAFD-4941-A913-8B0725691681}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B24BC602-DAFD-4941-A913-8B0725691681}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1246,10 +1234,8 @@ Global
{C3EEC9D9-F818-4058-B6F3-B71C1C0B8D47} = {4E54480A-D155-43ED-9736-1A5BE7957211}
{B64C5954-9CC0-4A0B-9453-92324B51C23D} = {4E54480A-D155-43ED-9736-1A5BE7957211}
{0ECCF46E-3989-4A7E-BA31-4E73D7515578} = {9AA521A5-80BF-4D20-9339-31D7E86D5868}
{4F0FEB76-5EB6-4AFC-9222-21DD22884A3B} = {9AA521A5-80BF-4D20-9339-31D7E86D5868}
{7E07BD13-74BF-4FD7-A294-07E664C47100} = {D3950CC9-808F-4ED8-946A-79A992F3F8EF}
{F50AF512-69E2-46B5-87C6-E058CE2C2D8A} = {D3950CC9-808F-4ED8-946A-79A992F3F8EF}
{1C0833AE-18DB-4E62-BB0A-226F4555CB09} = {9AA521A5-80BF-4D20-9339-31D7E86D5868}
{B24BC602-DAFD-4941-A913-8B0725691681} = {90B310B4-C2DB-419E-B5EE-97FA096B62CC}
{1B44277E-74EB-49B2-B8FD-05C29EE51985} = {4E54480A-D155-43ED-9736-1A5BE7957211}
EndGlobalSection
Expand Down
148 changes: 47 additions & 101 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,102 +1,48 @@
# File: azure-pipelines.yml
jobs:
# All tasks on Windows....
- job: build_all_windows
displayName: Build all tasks (Windows)
timeoutInMinutes: 120
pool:
vmImage: windows-latest
variables:
CI_TEST: true
steps:
- task: UseDotNet@2
displayName: 'Install .NET Core SDK'
inputs:
version: 6.0.x
- script: choco install protoc --version=3.19.4 -y
displayName: 'Install protobuf'
- script: choco install unzip
displayName: 'Install unzip'
- task: BatchScript@1
displayName: 'Download AElf build tools'
inputs:
filename: 'scripts/download_binary.bat'
- script: PowerShell.exe -file build.ps1 -target=Test-with-Codecov-N --parts=3 --n=1
displayName: 'Build and Test'
- task: PublishTestResults@2
condition: always()
inputs:
testRunner: VSTest
testResultsFiles: '**/*.trx'

- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
displayName: ReportGenerator
inputs:
reports: '$(Build.SourcesDirectory)/test/*/TestResults/*/coverage.cobertura.xml'
targetdir: '$(Build.SourcesDirectory)/CodeCoverage'
reporttypes: 'Cobertura'
assemblyfilters: '-xunit*'
- script: PowerShell.exe -file build.ps1 -target=Upload-Coverage-Azure
displayName: 'Upload data to Codecov'
# All tasks on Linux
- job: build_all_linux
displayName: Build all tasks (Linux)
timeoutInMinutes: 120
pool:
vmImage: ubuntu-latest
steps:
- task: UseDotNet@2
displayName: 'Install .NET Core SDK'
inputs:
version: 6.0.x
- script: bash scripts/install_protobuf.sh
- script: bash scripts/download_binary.sh
- script: bash build.sh -target=Test-with-Codecov-N --parts=3 --n=2
displayName: 'Build and Test'
- task: PublishTestResults@2
condition: always()
inputs:
testRunner: VSTest
testResultsFiles: '**/*.trx'

- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
displayName: ReportGenerator
inputs:
reports: '$(Build.SourcesDirectory)/test/*/TestResults/*/coverage.cobertura.xml'
targetdir: '$(Build.SourcesDirectory)/CodeCoverage'
reporttypes: 'Cobertura'
assemblyfilters: '-xunit*'
- script: bash build.sh -target=Upload-Coverage-Azure
displayName: 'Upload data to Codecov'

# All tasks on macOS
- job: build_all_darwin
displayName: Build all tasks (macOS)
timeoutInMinutes: 120
pool:
vmImage: macos-latest
variables:
CI_TEST: true
steps:
- task: UseDotNet@2
displayName: 'Install .NET Core SDK'
inputs:
version: 6.0.x
- script: bash scripts/install_protobuf.sh
- script: bash scripts/download_binary.sh
- script: bash build.sh -target=Test-with-Codecov-N --parts=3 --n=3
displayName: 'Build and Test'
- task: PublishTestResults@2
condition: always()
inputs:
testRunner: VSTest
testResultsFiles: '**/*.trx'

- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
displayName: ReportGenerator
inputs:
reports: '$(Build.SourcesDirectory)/test/*/TestResults/*/coverage.cobertura.xml'
targetdir: '$(Build.SourcesDirectory)/CodeCoverage'
reporttypes: 'Cobertura'
assemblyfilters: '-xunit*'
- script: bash build.sh -target=Upload-Coverage-Azure
displayName: 'Upload data to Codecov'
- template: templates/build-template-window.yml
parameters:
parts: 3
n: 1
codecoverage: true
- template: templates/build-template-window.yml
parameters:
parts: 3
n: 2
codecoverage: true
- template: templates/build-template-window.yml
parameters:
parts: 3
n: 3
codecoverage: false
- template: templates/build-template-linux.yml
parameters:
parts: 3
n: 1
codecoverage: true
- template: templates/build-template-linux.yml
parameters:
parts: 3
n: 2
codecoverage: false
- template: templates/build-template-linux.yml
parameters:
parts: 3
n: 3
codecoverage: false
- template: templates/build-template-macos.yml
parameters:
parts: 3
n: 1
codecoverage: true
- template: templates/build-template-macos.yml
parameters:
parts: 3
n: 2
codecoverage: true
- template: templates/build-template-macos.yml
parameters:
parts: 3
n: 3
codecoverage: true

7 changes: 5 additions & 2 deletions bench/AElf.Database.Benches/AElf.Database.Benches.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
14 changes: 3 additions & 11 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -137,29 +137,21 @@ Task("Test-with-Codecov-N")
.Append("--collect:\"XPlat Code Coverage\"");
}
};
var testSetting_nocoverage = new DotNetCoreTestSettings{
NoRestore = true,
NoBuild = true,
ArgumentCustomization = args => {
return args
.Append("--logger trx");
}
};
var codecovToken = "$CODECOV_TOKEN";
var actions = new List<Action>();
var testProjects = GetFiles("./test/*.Tests/*.csproj");
var testProjectList = testProjects.OrderBy(p=>p.FullPath).ToList();
var n = Argument("n",1);
var n = Argument("number",1);
var parts = Argument("parts",1);
var codecoverage = Argument("codecoverage",true);

Information($"n:{n}, parts:{parts}");
int i=0;
foreach(var testProject in testProjectList)
{
if(i++ % parts == n - 1){
DotNetCoreTest(testProject.FullPath, testSetting);
}else{
DotNetCoreTest(testProject.FullPath, testSetting_nocoverage);
if(!codecoverage) return;
}
}
});
Expand Down
1 change: 1 addition & 0 deletions common.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<PropertyGroup>
<PackageProjectUrl>https://aelf.io</PackageProjectUrl>
<Version>$(VersionSuffix)</Version>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/AElfProject/AElf/</RepositoryUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
Expand Down
Loading

0 comments on commit c57e2ee

Please sign in to comment.