Skip to content

Commit

Permalink
merge hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
tmm360 committed Nov 15, 2023
2 parents f6f4fc6 + 746c78c commit aea197b
Show file tree
Hide file tree
Showing 57 changed files with 296 additions and 287 deletions.
13 changes: 13 additions & 0 deletions .idea/.idea.EthernaSdk/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.idea.EthernaSdk/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/.idea.EthernaSdk/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.EthernaSdk/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.EthernaSdk/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 13 additions & 6 deletions EthernaServicesClient.sln → EthernaSdk.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitignore = .gitignore
EthernaServicesClient.sln.licenseheader = EthernaServicesClient.sln.licenseheader
LICENSE = LICENSE
README.md = README.md
EthernaSdk.sln.DotSettings = EthernaSdk.sln.DotSettings
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CC8EACB1-0C4A-456E-9A99-AEE5BB64CADF}"
Expand All @@ -28,15 +28,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5B6130FF
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreWorkerSample", "samples\AspNetCoreWorkerSample\AspNetCoreWorkerSample.csproj", "{D5A982B9-FD90-4141-93D8-F2CE979B2435}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaServicesClient.Common", "src\EthernaServicesClient.Common\EthernaServicesClient.Common.csproj", "{D5AE670E-13E4-47DC-84C5-ECF5900427D1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaSdk.Common", "src\EthernaSdk.Common\EthernaSdk.Common.csproj", "{D5AE670E-13E4-47DC-84C5-ECF5900427D1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaServicesClient.Internal", "src\EthernaServicesClient.Internal\EthernaServicesClient.Internal.csproj", "{E3FB5F6A-0B53-474F-9BDF-9AB21CCD52C8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaSdk.Internal", "src\EthernaSdk.Internal\EthernaSdk.Internal.csproj", "{E3FB5F6A-0B53-474F-9BDF-9AB21CCD52C8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaServicesClient.Internal.AspNetCore", "src\EthernaServicesClient.Internal.AspNetCore\EthernaServicesClient.Internal.AspNetCore.csproj", "{5B3FAC56-98AE-4B6B-B1B3-E1117B046717}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaSdk.Internal.AspNetCore", "src\EthernaSdk.Internal.AspNetCore\EthernaSdk.Internal.AspNetCore.csproj", "{5B3FAC56-98AE-4B6B-B1B3-E1117B046717}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaServicesClient.Users", "src\EthernaServicesClient.Users\EthernaServicesClient.Users.csproj", "{4A40D713-9B2C-4C7B-8E1A-58F7C5FB5DD4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaSdk.Users", "src\EthernaSdk.Users\EthernaSdk.Users.csproj", "{4A40D713-9B2C-4C7B-8E1A-58F7C5FB5DD4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaServicesClient.Users.Native", "src\EthernaServicesClient.Users.Native\EthernaServicesClient.Users.Native.csproj", "{A5C47534-973E-47E3-8E96-AE4B32A5D09F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaSdk.Users.Native", "src\EthernaSdk.Users.Native\EthernaSdk.Users.Native.csproj", "{A5C47534-973E-47E3-8E96-AE4B32A5D09F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{0E5080C1-2D28-481C-99EB-7F0EB0EE60B0}"
ProjectSection(SolutionItems) = preProject
.github\workflows\myget-unstable-deploy.yml = .github\workflows\myget-unstable-deploy.yml
.github\workflows\nuget-stable-deploy.yml = .github\workflows\nuget-stable-deploy.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -85,6 +91,7 @@ Global
{5B3FAC56-98AE-4B6B-B1B3-E1117B046717} = {CC8EACB1-0C4A-456E-9A99-AEE5BB64CADF}
{4A40D713-9B2C-4C7B-8E1A-58F7C5FB5DD4} = {CC8EACB1-0C4A-456E-9A99-AEE5BB64CADF}
{A5C47534-973E-47E3-8E96-AE4B32A5D09F} = {CC8EACB1-0C4A-456E-9A99-AEE5BB64CADF}
{0E5080C1-2D28-481C-99EB-7F0EB0EE60B0} = {C3177472-ED49-496E-B6A6-078780C322C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E7539252-E55D-43C2-B2C5-C9A77D191087}
Expand Down
15 changes: 15 additions & 0 deletions EthernaSdk.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<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">
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> Copyright 2020-present Etherna SA

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Etherna/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
47 changes: 0 additions & 47 deletions EthernaServicesClient.sln.licenseheader

This file was deleted.

4 changes: 2 additions & 2 deletions samples/AspNetCoreWorkerSample/AspNetCoreWorkerSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Etherna.ServicesClient.AspSampleClient</RootNamespace>

<Authors>Etherna Sagl</Authors>
<Authors>Etherna SA</Authors>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\EthernaServicesClient.Internal.AspNetCore\EthernaServicesClient.Internal.AspNetCore.csproj" />
<ProjectReference Include="..\..\src\EthernaSdk.Internal.AspNetCore\EthernaSdk.Internal.AspNetCore.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/AspNetCoreWorkerSample/Pages/Error.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@* Copyright 2020-present Etherna Sagl
@* Copyright 2020-present Etherna SA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
10 changes: 5 additions & 5 deletions samples/AspNetCoreWorkerSample/Pages/Error.cshtml.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2020-present Etherna Sagl
//
// Copyright 2020-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -16,7 +16,7 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
using System.Diagnostics;

namespace Etherna.ServicesClient.AspSampleClient.Pages
namespace Etherna.Sdk.AspSampleClient.Pages
{
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
[IgnoreAntiforgeryToken]
Expand Down
2 changes: 1 addition & 1 deletion samples/AspNetCoreWorkerSample/Pages/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@* Copyright 2020-present Etherna Sagl
@* Copyright 2020-present Etherna SA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions samples/AspNetCoreWorkerSample/Pages/Index.cshtml.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// Copyright 2020-present Etherna Sagl
//
// Copyright 2020-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Etherna.ServicesClient.Internal;
using Etherna.Sdk.Internal;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Configuration;
using System.Threading.Tasks;

namespace Etherna.ServicesClient.AspSampleClient.Pages
namespace Etherna.Sdk.AspSampleClient.Pages
{
public class IndexModel : PageModel
{
Expand Down
2 changes: 1 addition & 1 deletion samples/AspNetCoreWorkerSample/Pages/Privacy.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@* Copyright 2020-present Etherna Sagl
@* Copyright 2020-present Etherna SA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
10 changes: 5 additions & 5 deletions samples/AspNetCoreWorkerSample/Pages/Privacy.cshtml.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2020-present Etherna Sagl
//
// Copyright 2020-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -14,7 +14,7 @@

using Microsoft.AspNetCore.Mvc.RazorPages;

namespace Etherna.ServicesClient.AspSampleClient.Pages
namespace Etherna.Sdk.AspSampleClient.Pages
{
public class PrivacyModel : PageModel
{
Expand Down
2 changes: 1 addition & 1 deletion samples/AspNetCoreWorkerSample/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@* Copyright 2020-present Etherna Sagl
@* Copyright 2020-present Etherna SA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@* Copyright 2020-present Etherna Sagl
@* Copyright 2020-present Etherna SA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions samples/AspNetCoreWorkerSample/Pages/_ViewImports.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@* Copyright 2020-present Etherna Sagl
@* Copyright 2020-present Etherna SA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,6 +13,6 @@
* limitations under the License.
*@

@using Etherna.ServicesClient.AspSampleClient
@namespace Etherna.ServicesClient.AspSampleClient.Pages
@using Etherna.Sdk.AspSampleClient
@namespace Etherna.Sdk.AspSampleClient.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
2 changes: 1 addition & 1 deletion samples/AspNetCoreWorkerSample/Pages/_ViewStart.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@* Copyright 2020-present Etherna Sagl
@* Copyright 2020-present Etherna SA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions samples/AspNetCoreWorkerSample/Program.cs
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// Copyright 2020-present Etherna Sagl
//
// Copyright 2020-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Etherna.ServicesClient.Internal.AspNetCore;
using Etherna.Sdk.Internal.AspNetCore;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System;

namespace Etherna.ServicesClient.AspSampleClient
namespace Etherna.Sdk.AspSampleClient
{
public class Program
{
Expand Down
4 changes: 2 additions & 2 deletions samples/ConsoleWorkerSample/ConsoleWorkerSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Etherna.ServicesClient.SampleClient</RootNamespace>

<Authors>Etherna Sagl</Authors>
<Authors>Etherna SA</Authors>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand All @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\EthernaServicesClient.Internal\EthernaServicesClient.Internal.csproj" />
<ProjectReference Include="..\..\src\EthernaSdk.Internal\EthernaSdk.Internal.csproj" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions samples/ConsoleWorkerSample/Program.cs
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// Copyright 2020-present Etherna Sagl
//
// Copyright 2020-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Etherna.ServicesClient.Internal;
using Etherna.Sdk.Internal;
using IdentityModel.Client;
using System;
using System.Net.Http;
using System.Threading.Tasks;

namespace Etherna.ServicesClient.SampleClient
namespace Etherna.Sdk.SampleClient
{
class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RootNamespace>Etherna.ServicesClient</RootNamespace>
<RootNamespace>Etherna.Sdk</RootNamespace>

<Authors>Etherna Sagl</Authors>
<Authors>Etherna SA</Authors>
<Description>A common library for Etherna service clients</Description>

<Nullable>enable</Nullable>
Expand Down
Loading

0 comments on commit aea197b

Please sign in to comment.