Skip to content

Commit 6003448

Browse files
wzh425wzh425
authored
Merge pull request #21 from masastack/feature/wasm
🆕 feat: support wasm
2 parents 5efd6c2 + afb54bd commit 6003448

File tree

90 files changed

+3173
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3173
-16
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.0.0</MicrosoftPackageVersion>
55
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.0</MicrosoftPackageVersion>
66
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</MicrosoftPackageVersion>
7-
<MasaFrameworkPackageVersion>1.2.0-preview.2</MasaFrameworkPackageVersion>
7+
<MasaFrameworkPackageVersion>1.2.0-preview.3</MasaFrameworkPackageVersion>
88

99
<OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
1010
<OpenTelemetryContribVersion>1.9.0</OpenTelemetryContribVersion>
@@ -17,10 +17,4 @@
1717
<CoverletPackageVersion>3.0.2</CoverletPackageVersion>
1818
<MicrosoftTeskSdkPackageVersion>16.9.4</MicrosoftTeskSdkPackageVersion>
1919
</PropertyGroup>
20-
21-
<!--<ItemGroup>
22-
<PackageReference Include="Masa.BuildingBlocks.Ddd.Domain" Version="$(MasaFrameworkPackageVersion)" />
23-
<PackageReference Include="Masa.BuildingBlocks.Data" Version="$(MasaFrameworkPackageVersion)" />
24-
<PackageReference Include="Masa.Contrib.Service.Caller.HttpClient" Version="$(MasaFrameworkPackageVersion)" />
25-
</ItemGroup>-->
2620
</Project>

‎MASA.Stack.Sdks.sln‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Pm.T
8787
EndProject
8888
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.StackSdks.Tsc.Contracts", "src\BuildingBlocks\Tsc\Masa.BuildingBlocks.StackSdks.Tsc.Contracts\Masa.BuildingBlocks.StackSdks.Tsc.Contracts.csproj", "{3712E0BB-946E-43FC-8E38-4E42C24FBA50}"
8989
EndProject
90-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.BuildingBlocks.StackSdks.Base", "src\BuildingBlocks\Masa.BuildingBlocks.StackSdks.Base\Masa.BuildingBlocks.StackSdks.Base.csproj", "{F031FF57-5B4A-4464-83AE-FEDF11104D3F}"
90+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contrib.Wasm", "Contrib.Wasm", "{5D651272-A474-467B-8FAD-FD92FE1295B8}"
91+
EndProject
92+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Config.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Config.Wasm\Masa.Contrib.StackSdks.Config.Wasm.csproj", "{7AD38D7B-2DE6-4BF9-B10C-3930B565327B}"
93+
EndProject
94+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Isolation.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Isolation.Wasm\Masa.Contrib.StackSdks.Isolation.Wasm.csproj", "{50F1B67A-CE97-4360-AAC6-348E87CF8CA1}"
95+
EndProject
96+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Caller.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Caller.Wasm\Masa.Contrib.StackSdks.Caller.Wasm.csproj", "{6EE36620-2A81-4DA5-A250-C83BC6AF461C}"
97+
EndProject
98+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Dcc.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Dcc.Wasm\Masa.Contrib.StackSdks.Dcc.Wasm.csproj", "{F03E359C-F86F-443F-971F-3A32BA3A75A2}"
99+
EndProject
100+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Auth.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Auth.Wasm\Masa.Contrib.StackSdks.Auth.Wasm.csproj", "{6C83F574-8B20-4D38-9356-DDF77326F4B4}"
101+
EndProject
102+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Pm.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Pm.Wasm\Masa.Contrib.StackSdks.Pm.Wasm.csproj", "{99DF687D-F549-4BDD-AD34-985C85DEC606}"
103+
EndProject
104+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Mc.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Mc.Wasm\Masa.Contrib.StackSdks.Mc.Wasm.csproj", "{676212A8-1094-451F-B7D6-1ABC15D6A67F}"
105+
EndProject
106+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.StackSdks.Tsc.Wasm", "src\Contrib.Wasm\Masa.Contrib.StackSdks.Tsc.Wasm\Masa.Contrib.StackSdks.Tsc.Wasm.csproj", "{AA18CB28-898E-4E9D-9919-775AF574E9A1}"
107+
EndProject
108+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.StackSdks.Base", "src\BuildingBlocks\Masa.BuildingBlocks.StackSdks.Base\Masa.BuildingBlocks.StackSdks.Base.csproj", "{F031FF57-5B4A-4464-83AE-FEDF11104D3F}"
91109
EndProject
92110
Global
93111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -235,6 +253,38 @@ Global
235253
{3712E0BB-946E-43FC-8E38-4E42C24FBA50}.Debug|Any CPU.Build.0 = Debug|Any CPU
236254
{3712E0BB-946E-43FC-8E38-4E42C24FBA50}.Release|Any CPU.ActiveCfg = Release|Any CPU
237255
{3712E0BB-946E-43FC-8E38-4E42C24FBA50}.Release|Any CPU.Build.0 = Release|Any CPU
256+
{7AD38D7B-2DE6-4BF9-B10C-3930B565327B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
257+
{7AD38D7B-2DE6-4BF9-B10C-3930B565327B}.Debug|Any CPU.Build.0 = Debug|Any CPU
258+
{7AD38D7B-2DE6-4BF9-B10C-3930B565327B}.Release|Any CPU.ActiveCfg = Release|Any CPU
259+
{7AD38D7B-2DE6-4BF9-B10C-3930B565327B}.Release|Any CPU.Build.0 = Release|Any CPU
260+
{50F1B67A-CE97-4360-AAC6-348E87CF8CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
261+
{50F1B67A-CE97-4360-AAC6-348E87CF8CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
262+
{50F1B67A-CE97-4360-AAC6-348E87CF8CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
263+
{50F1B67A-CE97-4360-AAC6-348E87CF8CA1}.Release|Any CPU.Build.0 = Release|Any CPU
264+
{6EE36620-2A81-4DA5-A250-C83BC6AF461C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
265+
{6EE36620-2A81-4DA5-A250-C83BC6AF461C}.Debug|Any CPU.Build.0 = Debug|Any CPU
266+
{6EE36620-2A81-4DA5-A250-C83BC6AF461C}.Release|Any CPU.ActiveCfg = Release|Any CPU
267+
{6EE36620-2A81-4DA5-A250-C83BC6AF461C}.Release|Any CPU.Build.0 = Release|Any CPU
268+
{F03E359C-F86F-443F-971F-3A32BA3A75A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
269+
{F03E359C-F86F-443F-971F-3A32BA3A75A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
270+
{F03E359C-F86F-443F-971F-3A32BA3A75A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
271+
{F03E359C-F86F-443F-971F-3A32BA3A75A2}.Release|Any CPU.Build.0 = Release|Any CPU
272+
{6C83F574-8B20-4D38-9356-DDF77326F4B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
273+
{6C83F574-8B20-4D38-9356-DDF77326F4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
274+
{6C83F574-8B20-4D38-9356-DDF77326F4B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
275+
{6C83F574-8B20-4D38-9356-DDF77326F4B4}.Release|Any CPU.Build.0 = Release|Any CPU
276+
{99DF687D-F549-4BDD-AD34-985C85DEC606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
277+
{99DF687D-F549-4BDD-AD34-985C85DEC606}.Debug|Any CPU.Build.0 = Debug|Any CPU
278+
{99DF687D-F549-4BDD-AD34-985C85DEC606}.Release|Any CPU.ActiveCfg = Release|Any CPU
279+
{99DF687D-F549-4BDD-AD34-985C85DEC606}.Release|Any CPU.Build.0 = Release|Any CPU
280+
{676212A8-1094-451F-B7D6-1ABC15D6A67F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
281+
{676212A8-1094-451F-B7D6-1ABC15D6A67F}.Debug|Any CPU.Build.0 = Debug|Any CPU
282+
{676212A8-1094-451F-B7D6-1ABC15D6A67F}.Release|Any CPU.ActiveCfg = Release|Any CPU
283+
{676212A8-1094-451F-B7D6-1ABC15D6A67F}.Release|Any CPU.Build.0 = Release|Any CPU
284+
{AA18CB28-898E-4E9D-9919-775AF574E9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
285+
{AA18CB28-898E-4E9D-9919-775AF574E9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
286+
{AA18CB28-898E-4E9D-9919-775AF574E9A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
287+
{AA18CB28-898E-4E9D-9919-775AF574E9A1}.Release|Any CPU.Build.0 = Release|Any CPU
238288
{F031FF57-5B4A-4464-83AE-FEDF11104D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
239289
{F031FF57-5B4A-4464-83AE-FEDF11104D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
240290
{F031FF57-5B4A-4464-83AE-FEDF11104D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -285,6 +335,15 @@ Global
285335
{57F819F4-B50A-4E99-BCB4-D9BABDFFEF4F} = {E9F8566C-353D-4B97-98AE-ED0A0D3D00DF}
286336
{639F796D-B15B-443A-8D86-20194466706F} = {E9F8566C-353D-4B97-98AE-ED0A0D3D00DF}
287337
{3712E0BB-946E-43FC-8E38-4E42C24FBA50} = {E05154EB-0EF4-4974-AFDC-DD196BF5A75F}
338+
{5D651272-A474-467B-8FAD-FD92FE1295B8} = {66AAB813-41F7-473D-8A05-4A71F3CA9EC0}
339+
{7AD38D7B-2DE6-4BF9-B10C-3930B565327B} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
340+
{50F1B67A-CE97-4360-AAC6-348E87CF8CA1} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
341+
{6EE36620-2A81-4DA5-A250-C83BC6AF461C} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
342+
{F03E359C-F86F-443F-971F-3A32BA3A75A2} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
343+
{6C83F574-8B20-4D38-9356-DDF77326F4B4} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
344+
{99DF687D-F549-4BDD-AD34-985C85DEC606} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
345+
{676212A8-1094-451F-B7D6-1ABC15D6A67F} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
346+
{AA18CB28-898E-4E9D-9919-775AF574E9A1} = {5D651272-A474-467B-8FAD-FD92FE1295B8}
288347
{F031FF57-5B4A-4464-83AE-FEDF11104D3F} = {CF02987E-1244-4597-9B0D-0971BF9833B2}
289348
EndGlobalSection
290349
GlobalSection(ExtensibilityGlobals) = postSolution

‎src/BuildingBlocks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/SecurityTokenModel.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
2+
3+
public class SecurityTokenModel
4+
{
5+
public string Region { get; set; }
6+
7+
public string AccessKeyId { get; set; }
8+
9+
public string AccessKeySecret { get; set; }
10+
11+
public string StsToken { get; set; }
12+
13+
public string Bucket { get; set; }
14+
}

‎src/BuildingBlocks/Auth/Masa.BuildingBlocks.StackSdks.Auth/IAuthClient.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ public interface IAuthClient
1818
ICustomLoginService CustomLoginService { get; }
1919

2020
IThirdPartyIdpService ThirdPartyIdpService { get; }
21+
22+
IOssService OssService { get; }
2123
}
2224

‎src/BuildingBlocks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IOssService.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace Masa.BuildingBlocks.StackSdks.Auth.Service;
2+
3+
public interface IOssService
4+
{
5+
Task<SecurityTokenModel> GetSecurityTokenAsync();
6+
}

‎src/BuildingBlocks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/ITeamService.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ public interface ITeamService
1010
Task<List<TeamModel>> GetAllAsync(string environment);
1111

1212
Task<List<TeamModel>> GetUserTeamsAsync();
13-
}
14-
13+
}

‎src/BuildingBlocks/Dcc/Masa.BuildingBlocks.StackSdks.Dcc/IDccClient.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ namespace Masa.BuildingBlocks.StackSdks.Dcc;
66
public interface IDccClient
77
{
88
public ILabelService LabelService { get; }
9+
10+
public IOpenApiService OpenApiService { get; }
911
}

‎src/BuildingBlocks/Dcc/Masa.BuildingBlocks.StackSdks.Dcc/Service/IOpenApiService.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace Masa.BuildingBlocks.StackSdks.Dcc.Service;
2+
3+
public interface IOpenApiService
4+
{
5+
Task<T> GetPublicConfigAsync<T>(string configObject, string environment = "", string cluster = "") where T : class, new();
6+
}

‎src/BuildingBlocks/Masa.BuildingBlocks.StackSdks.Config/Masa.BuildingBlocks.StackSdks.Config.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77

8+
<ItemGroup>
9+
<PackageReference Include="Masa.BuildingBlocks.Data.Contracts" Version="$(MasaFrameworkPackageVersion)" />
10+
</ItemGroup>
11+
812
</Project>

‎src/BuildingBlocks/Masa.BuildingBlocks.StackSdks.Config/_Imports.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4+
global using Masa.BuildingBlocks.Data.Contracts;
45
global using Masa.BuildingBlocks.StackSdks.Config;
56
global using Masa.BuildingBlocks.StackSdks.Config.Models;
67
global using System.Security.Cryptography;
7-
global using System.Text;
8+
global using System.Text;

0 commit comments

Comments
 (0)