Skip to content

Commit

Permalink
Merge pull request #7 from make-software/upgrade-erc20-demo-dependencies
Browse files Browse the repository at this point in the history
Upgrade .NET version and dependencies
davidatwhiletrue authored Feb 20, 2024
2 parents 0e97292 + 82a23b5 commit 3028a98
Showing 12 changed files with 1,730 additions and 1,369 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-testing.yml
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
2 changes: 1 addition & 1 deletion .github/workflows/nuget-publish.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 7.0.x

- name: publish on version change
id: publish_nuget
16 changes: 8 additions & 8 deletions Casper.Network.SDK.Web.Test/Casper.Network.SDK.Web.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
<PackageReference Include="coverlet.collector" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.15" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.10.0" />
<PackageReference Include="coverlet.collector" Version="3.2.0" />
</ItemGroup>

<ItemGroup>
6 changes: 6 additions & 0 deletions Casper.Network.SDK.Web.Test/CasperLedgerInteropTest.cs
Original file line number Diff line number Diff line change
@@ -98,6 +98,12 @@ public void AfterEachTest()
Assert.That(_jsMock.Invocations.Count, Is.Not.Zero);
}

[OneTimeTearDown]
public async Task DisposeArtifacts()
{
await _applicationFactory.DisposeAsync();
}

// [Test]
// public async Task GetVersionTest()
// {
6 changes: 6 additions & 0 deletions Casper.Network.SDK.Web.Test/CasperRPCServiceTests.cs
Original file line number Diff line number Diff line change
@@ -46,6 +46,12 @@ public void Setup()
Assert.That(_casperClient, Is.Not.Null);
}

[TearDown]
public async Task DisposeArtifacts()
{
await _applicationFactory.DisposeAsync();
}

[Test]
public async Task GetStateRootHashTest()
{
6 changes: 6 additions & 0 deletions Casper.Network.SDK.Web.Test/CasperSignerInteropTest.cs
Original file line number Diff line number Diff line change
@@ -85,6 +85,12 @@ public void AfterEachTest()
Assert.That(_jsObjMock.Invocations.Count, Is.Not.Zero);
}

[OneTimeTearDown]
public async Task DisposeArtifacts()
{
await _applicationFactory.DisposeAsync();
}

[Test]
public async Task GetVersionTest()
{
2 changes: 1 addition & 1 deletion Casper.Network.SDK.Web.Test/testApplication.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Casper.Network.SDK.Web" : {
"NodeAddress": "https://casper-node-proxy.dev.make.services/rpc",
"NodeAddress": "http://52.35.59.254:7777/rpc",
"ClientFactory": "caspernode",
"ChainName": "casper-test",
"SSEHost": "127.0.0.1",
10 changes: 5 additions & 5 deletions Casper.Network.SDK.Web/Casper.Network.SDK.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0</FileVersion>
<PackageVersion>1.1.0</PackageVersion>
@@ -24,10 +24,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Casper.Network.SDK" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.13" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Casper.Network.SDK" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.15" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
194 changes: 97 additions & 97 deletions Casper.Network.SDK.Web/npm_packages/package-lock.json
7 changes: 4 additions & 3 deletions Casper.Network.SDK.Web/npm_packages/package.json
Original file line number Diff line number Diff line change
@@ -15,11 +15,12 @@
"ts-loader": "^9.2.8",
"typescript": "^4.6.3",
"webpack": "^5.70.0",
"webpack-cli": "^4.9.2"
"webpack-cli": "^4.9.2",
"semver": "7.6.0"
},
"dependencies": {
"@ledgerhq/hw-transport-webusb": "^6.24.1",
"@zondax/ledger-casper": "^2.4.3",
"@ledgerhq/hw-transport-webusb": "^6.28.3",
"@zondax/ledger-casper": "^2.6.1",
"buffer": "^6.0.3",
"lodash": "^4.17.21",
"stream-browserify": "^3.0.0"
2,838 changes: 1,590 additions & 1,248 deletions Casper.Network.SDK.Web/wwwroot/casperLedgerInterop.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Docs/Demos/CasperERC20/CasperERC20.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Nullable>disable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.2" />
<PackageReference Include="Radzen.Blazor" Version="3.13.10" />
<PackageReference Include="Casper.Network.SDK.Clients" Version="1.1.0" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.15" />
<PackageReference Include="Radzen.Blazor" Version="4.24.6" />
<PackageReference Include="Casper.Network.SDK.Clients" Version="1.2.0" />
</ItemGroup>

<ItemGroup>

0 comments on commit 3028a98

Please sign in to comment.