Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Preview3 to Master #307

Merged
merged 3 commits into from
Aug 5, 2020
Merged

Merge Preview3 to Master #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71d9968
Add Utility.StackItemFromJson (#302) (#303)
superboyiii Jul 30, 2020
16ff1e0
update to preview3 (#305)
superboyiii Jul 31, 2020
9e976a6
Merge branch 'master' into preview3
superboyiii Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ApplicationLogs/ApplicationLogs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>3.0.0-preview2</Version>
<Version>3.0.0-preview3</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Neo.Plugins</RootNamespace>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/LevelDBStore/LevelDBStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>3.0.0-preview2</Version>
<Version>3.0.0-preview3</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Neo</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-CI00970" />
<PackageReference Include="Neo" Version="3.0.0-preview3-00" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/RocksDBStore/RocksDBStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>3.0.0-preview2</Version>
<Version>3.0.0-preview3</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Neo.Plugins.Storage</RootNamespace>
</PropertyGroup>
Expand All @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-CI00970" />
<PackageReference Include="Neo" Version="3.0.0-preview3-00" />
<PackageReference Include="RocksDbNative" Version="6.2.2" />
<PackageReference Include="RocksDbSharp" Version="6.2.2" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/RpcClient/RpcClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>3.0.0-preview2</Version>
<Version>3.0.0-preview3</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Neo.Network.RPC</RootNamespace>
<Authors>The Neo Project</Authors>
Expand All @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-CI00972" />
<PackageReference Include="Neo" Version="3.0.0-preview3-00" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use the latest version for nugets in master

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or do you want to merge for create the tag?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or do you want to merge for create the tag?

Yes, should use the latest version of nuget. I've already created the tag on preview3 branch, no need on master since there will be extra commit on master.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we merge first and I upgrade the latest neo dependency in master later? I think they are two workflows after release.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we can update them here

Copy link
Member Author

@superboyiii superboyiii Aug 4, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we can update them here

I can't do this since preview3 is the release branch and should not be changed from nuget 3.0.0-preview3-00. I have to wait until master is merged. Master need change version from preview2 to preview3 except the dependency is not the latest.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok! approved :)

</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/RpcNep5Tracker/RpcNep5Tracker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>3.0.0-preview2</Version>
<Version>3.0.0-preview3</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Neo.Plugins</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/RpcServer/RpcServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>3.0.0-preview2</Version>
<Version>3.0.0-preview3</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Neo.Plugins</RootNamespace>
</PropertyGroup>
Expand All @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
<PackageReference Include="Neo" Version="3.0.0-CI00970" />
<PackageReference Include="Neo" Version="3.0.0-preview3-00" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/StatesDumper/StatesDumper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>3.0.0-preview2</Version>
<Version>3.0.0-preview3</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Neo.Plugins</RootNamespace>
</PropertyGroup>
Expand All @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-CI00970" />
<PackageReference Include="Neo" Version="3.0.0-preview3-00" />
<PackageReference Include="Neo.ConsoleService" Version="1.0.0" />
</ItemGroup>

Expand Down