From 1b76cd0df8043205ed4f3c8d995e22062dfa9d9f Mon Sep 17 00:00:00 2001 From: hoak Date: Mon, 14 Nov 2022 20:32:33 +0000 Subject: [PATCH 1/3] changing mainnet program id to openbook-dex community fork --- README.md | 6 +++--- SharedBuildProperties.props | 2 +- Solnet.Serum.Examples/Solnet.Serum.Examples.csproj | 6 +++--- Solnet.Serum/SerumProgram.cs | 2 +- Solnet.Serum/Solnet.Serum.csproj | 6 +++--- chver.sh | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 77029bc..f2d2729 100644 --- a/README.md +++ b/README.md @@ -71,9 +71,9 @@ separate repository so it is contained, as the goal for [Solnet](https://github. - net 6.0 ## Dependencies -- Solnet.Rpc v6.0.13 -- Solnet.Wallet v6.0.13 -- Solnet.Programs v6.0.13 +- Solnet.Rpc v6.0.14 +- Solnet.Wallet v6.0.14 +- Solnet.Programs v6.0.14 ## Examples diff --git a/SharedBuildProperties.props b/SharedBuildProperties.props index 6c1d0dc..4a6e741 100644 --- a/SharedBuildProperties.props +++ b/SharedBuildProperties.props @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> Solnet.Serum - 6.0.13 + 6.0.14 Copyright 2022 © Solnet blockmountain blockmountain diff --git a/Solnet.Serum.Examples/Solnet.Serum.Examples.csproj b/Solnet.Serum.Examples/Solnet.Serum.Examples.csproj index eadb8bc..54ff616 100644 --- a/Solnet.Serum.Examples/Solnet.Serum.Examples.csproj +++ b/Solnet.Serum.Examples/Solnet.Serum.Examples.csproj @@ -12,8 +12,8 @@ - - - + + + diff --git a/Solnet.Serum/SerumProgram.cs b/Solnet.Serum/SerumProgram.cs index bcfb5ac..1be7bc0 100644 --- a/Solnet.Serum/SerumProgram.cs +++ b/Solnet.Serum/SerumProgram.cs @@ -25,7 +25,7 @@ public class SerumProgram : BaseProgram /// /// The Serum V3 Program key for . /// - public static readonly PublicKey MainNetProgramIdKeyV3 = new("9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin"); + public static readonly PublicKey MainNetProgramIdKeyV3 = new("srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX"); /// /// The Serum V3 Program key for . diff --git a/Solnet.Serum/Solnet.Serum.csproj b/Solnet.Serum/Solnet.Serum.csproj index 086d9f7..80d3bde 100644 --- a/Solnet.Serum/Solnet.Serum.csproj +++ b/Solnet.Serum/Solnet.Serum.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/chver.sh b/chver.sh index b16602c..1eab1ee 100644 --- a/chver.sh +++ b/chver.sh @@ -1,6 +1,6 @@ #!/bin/bash -PREV="6.0.13" +PREV="6.0.14" FILES="README.md SharedBuildProperties.props From 50ba9b782f4a820cabf531fce9d6d031c9a8f611 Mon Sep 17 00:00:00 2001 From: hoak Date: Sat, 26 Nov 2022 12:54:55 +0000 Subject: [PATCH 2/3] fixing pipeline --- build.cake | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build.cake b/build.cake index e8b012a..2f6ac3b 100644 --- a/build.cake +++ b/build.cake @@ -1,4 +1,3 @@ -#module nuget:?package=Cake.DotNetTool.Module&version=0.4.0 #addin nuget:?package=Cake.Coverlet&version=2.5.4 #tool dotnet:?package=dotnet-reportgenerator-globaltool&version=4.8.7 @@ -28,13 +27,13 @@ Task("Clean") Task("Restore") .Does(() => { - DotNetCoreRestore(solutionFolder); + DotNetRestore(solutionFolder); }); Task("Build") .IsDependentOn("Restore") .Does(() => { - DotNetCoreBuild(solutionFolder, new DotNetCoreBuildSettings + DotNetBuild(solutionFolder, new DotNetBuildSettings { NoRestore = true, Configuration = configuration @@ -53,7 +52,7 @@ Task("Test") CoverletOutputFormat = CoverletOutputFormat.lcov }; - var testSettings = new DotNetCoreTestSettings + var testSettings = new DotNetTestSettings { NoRestore = true, Configuration = configuration, @@ -61,7 +60,7 @@ Task("Test") ArgumentCustomization = args => args.Append($"--logger trx"), }; - DotNetCoreTest(testProjectsRelativePaths[0], testSettings, coverletSettings); + DotNetTest(testProjectsRelativePaths[0], testSettings, coverletSettings); }); @@ -80,7 +79,7 @@ Task("Report") Task("Publish") .IsDependentOn("Report") .Does(() => { - DotNetCorePublish(solutionFolder, new DotNetCorePublishSettings + DotNetPublish(solutionFolder, new DotNetPublishSettings { NoRestore = true, Configuration = configuration, @@ -93,7 +92,7 @@ Task("Pack") .IsDependentOn("Publish") .Does(() => { - var settings = new DotNetCorePackSettings + var settings = new DotNetPackSettings { Configuration = configuration, NoBuild = true, @@ -102,7 +101,7 @@ Task("Pack") OutputDirectory = packagesDir }; - DotNetCorePack("./Solnet.Serum/", settings); + DotNetPack("./Solnet.Serum/", settings); }); RunTarget(target); \ No newline at end of file From 75885643800714d1f43c9f0d631f6a1e6103f801 Mon Sep 17 00:00:00 2001 From: hoak Date: Sat, 26 Nov 2022 13:13:43 +0000 Subject: [PATCH 3/3] fixing pipeline fr --- .github/workflows/dotnet.yml | 1 + build.cake | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ad82ef3..655d691 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,6 +17,7 @@ jobs: with: script-path: build.cake target: Report + cake-version: 1.1.0 cake-bootstrap: true - name: Publish coverage report to coveralls.io uses: coverallsapp/github-action@v1.1.2 diff --git a/build.cake b/build.cake index 2f6ac3b..e8b012a 100644 --- a/build.cake +++ b/build.cake @@ -1,3 +1,4 @@ +#module nuget:?package=Cake.DotNetTool.Module&version=0.4.0 #addin nuget:?package=Cake.Coverlet&version=2.5.4 #tool dotnet:?package=dotnet-reportgenerator-globaltool&version=4.8.7 @@ -27,13 +28,13 @@ Task("Clean") Task("Restore") .Does(() => { - DotNetRestore(solutionFolder); + DotNetCoreRestore(solutionFolder); }); Task("Build") .IsDependentOn("Restore") .Does(() => { - DotNetBuild(solutionFolder, new DotNetBuildSettings + DotNetCoreBuild(solutionFolder, new DotNetCoreBuildSettings { NoRestore = true, Configuration = configuration @@ -52,7 +53,7 @@ Task("Test") CoverletOutputFormat = CoverletOutputFormat.lcov }; - var testSettings = new DotNetTestSettings + var testSettings = new DotNetCoreTestSettings { NoRestore = true, Configuration = configuration, @@ -60,7 +61,7 @@ Task("Test") ArgumentCustomization = args => args.Append($"--logger trx"), }; - DotNetTest(testProjectsRelativePaths[0], testSettings, coverletSettings); + DotNetCoreTest(testProjectsRelativePaths[0], testSettings, coverletSettings); }); @@ -79,7 +80,7 @@ Task("Report") Task("Publish") .IsDependentOn("Report") .Does(() => { - DotNetPublish(solutionFolder, new DotNetPublishSettings + DotNetCorePublish(solutionFolder, new DotNetCorePublishSettings { NoRestore = true, Configuration = configuration, @@ -92,7 +93,7 @@ Task("Pack") .IsDependentOn("Publish") .Does(() => { - var settings = new DotNetPackSettings + var settings = new DotNetCorePackSettings { Configuration = configuration, NoBuild = true, @@ -101,7 +102,7 @@ Task("Pack") OutputDirectory = packagesDir }; - DotNetPack("./Solnet.Serum/", settings); + DotNetCorePack("./Solnet.Serum/", settings); }); RunTarget(target); \ No newline at end of file