Skip to content

Commit 1e995cd

Browse files
catcherwongcatcherwong
authored
Merge pull request #208 from nacos-group/dev
v1.3.3 release
2 parents 83eae08 + 66712bc commit 1e995cd

32 files changed

+773
-367
lines changed

‎.github/workflows/build_Stable_1x.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
run: java -version
4747
- name: Setup Stable 1.x Nacos Server
4848
run: |
49-
wget https://github.com/alibaba/nacos/releases/download/1.4.2/nacos-server-1.4.2.tar.gz
50-
tar -xvf nacos-server-1.4.2.tar.gz
49+
wget https://github.com/alibaba/nacos/releases/download/1.4.3/nacos-server-1.4.3.tar.gz
50+
tar -xvf nacos-server-1.4.3.tar.gz
5151
cd nacos/bin
5252
# sed -i 's/nacos.core.auth.enabled=false/nacos.core.auth.enabled=true/g' ../conf/application.properties
5353
chmod 755 startup.sh

‎.github/workflows/build_Stable_2x.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
run: java -version
4747
- name: Setup Stable 2.x Nacos Server
4848
run: |
49-
wget https://github.com/alibaba/nacos/releases/download/2.0.2/nacos-server-2.0.2.tar.gz
50-
tar -xvf nacos-server-2.0.2.tar.gz
49+
wget https://github.com/alibaba/nacos/releases/download/2.0.4/nacos-server-2.0.4.tar.gz
50+
tar -xvf nacos-server-2.0.4.tar.gz
5151
cd nacos/bin
5252
# sed -i 's/nacos.core.auth.enabled=false/nacos.core.auth.enabled=true/g' ../conf/application.properties
5353
chmod 755 startup.sh

‎.github/workflows/build_Unstable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
run: java -version
2929
- name: Setup Unstable Nacos Server
3030
run: |
31-
wget https://github.com/alibaba/nacos/releases/download/2.0.3/nacos-server-2.0.3.tar.gz
32-
tar -xvf nacos-server-2.0.3.tar.gz
31+
wget https://github.com/alibaba/nacos/releases/download/2.1.0/nacos-server-2.1.0.tar.gz
32+
tar -xvf nacos-server-2.1.0.tar.gz
3333
cd nacos/bin
3434
# sed -i 's/nacos.core.auth.enabled=false/nacos.core.auth.enabled=true/g' ../conf/application.properties
3535
sed -i 's/Xms512m/Xms1024m/g' startup.sh

‎docs/blogs/info.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
2022
55
^^^^^^^^^^^^^
66

7+
- `微服务 配置中心 Nacos .Net 5 <https://blog.csdn.net/i2blue/article/details/124827269>`_ 【2022-05-17】
78
- `待挖掘 <https://github.com/nacos-group/nacos-sdk-csharp>`_ 【2022-xx-xx】
89

910

‎docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
:hidden:
4141
:caption: Release Note
4242

43-
releasenote/v1.2.1
4443
releasenote/v1.2.2
4544
releasenote/v1.3.0
4645
releasenote/v1.3.1
4746
releasenote/v1.3.2
47+
releasenote/v1.3.3
4848

4949
.. toctree::
5050
:maxdepth: 2

‎docs/releasenote/v1.3.3.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
v1.3.3 (May 30th, 2022) 发布记录
2+
=============================================
3+
4+
1. [NAMING] Fix IsSubscribed exception when NamingUseRpc is false (#194 #196)
5+
#. [CONFIG] Fix ReceiveConfigInfo dict get item error in startup (#200 #201)
6+
#. [CONFIG] Improve Microsoft.Extensions.Configuration Integration (#203 #204)
7+
#. [CONFIG] Config cache path from JM.SNAPSHOT.PATH env at first (#205 #206)
8+
#. [CORE] Add package readme file (#207)
9+
#. [CI] Update version of Nacos Server
10+
11+
------------
12+
13+
1. [NAMING] 修复 NamingUseRpc 设置成 false 是 IsSubscribed 抛异常的问题 (#194 #196)
14+
#. [CONFIG] 修复启动时 ReceiveConfigInfo 字典操作异常问题 (#200 #201)
15+
#. [CONFIG] 优化 Microsoft.Extensions.Configuration 的集成 (#203 #204)
16+
#. [CONFIG] 优化配置缓存的路径读取方式 (#205 #206)
17+
#. [CORE] 添加nuget包说明文件 (#207)
18+
#. [CI] 更新 Nacos Server 版本

‎parsers/Nacos.IniParser/Nacos.IniParser.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RepositoryUrl>https://github.com/nacos-group/nacos-sdk-csharp</RepositoryUrl>
1414
<ProjectUrl>https://github.com/nacos-group/nacos-sdk-csharp</ProjectUrl>
1515
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
1617
<PackageReleaseNotes>
1718
</PackageReleaseNotes>
1819
</PropertyGroup>
@@ -24,6 +25,7 @@
2425

2526
<ItemGroup>
2627
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
28+
<None Include="README.md" Pack="true" Visible="false" PackagePath="" />
2729
</ItemGroup>
2830

2931
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

‎parsers/Nacos.IniParser/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# nacos-sdk-csharp.IniParser
2+
3+
nacos-sdk-csharp.IniParser provides ini format config parser.
4+
5+
```csharp
6+
builder.Host.UseNacosConfig(section: "NacosConfig", parser: Nacos.IniParser.IniConfigurationStringParser.Instance);
7+
8+
// or
9+
10+
builder.Host.ConfigureAppConfiguration((c, b) =>
11+
{
12+
var config = b.Build();
13+
14+
b.AddNacosV2Configuration(config.GetSection("NacosConfig"), parser: Nacos.IniParser.IniConfigurationStringParser.Instance);
15+
});
16+
```
17+
18+
## Links
19+
20+
* [Documentation](https://nacos-sdk-csharp.readthedocs.io/en/latest/)
21+
* [nacos-sdk-csharp GitHub](https://github.com/nacos-group/nacos-sdk-csharp)

‎parsers/Nacos.YamlParser/Nacos.YamlParser.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RepositoryUrl>https://github.com/nacos-group/nacos-sdk-csharp</RepositoryUrl>
1414
<ProjectUrl>https://github.com/nacos-group/nacos-sdk-csharp</ProjectUrl>
1515
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
1617
<PackageReleaseNotes>
1718
</PackageReleaseNotes>
1819
</PropertyGroup>
@@ -24,6 +25,7 @@
2425

2526
<ItemGroup>
2627
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
28+
<None Include="README.md" Pack="true" Visible="false" PackagePath="" />
2729
</ItemGroup>
2830

2931
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

‎parsers/Nacos.YamlParser/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# nacos-sdk-csharp.YamlParser
2+
3+
nacos-sdk-csharp.YamlParser provides yaml/yml format config parser.
4+
5+
```csharp
6+
builder.Host.UseNacosConfig(section: "NacosConfig", parser: Nacos.YamlParser.YamlConfigurationStringParser.Instance);
7+
8+
// or
9+
10+
builder.Host.ConfigureAppConfiguration((c, b) =>
11+
{
12+
var config = b.Build();
13+
14+
b.AddNacosV2Configuration(config.GetSection("NacosConfig"), parser: Nacos.YamlParser.YamlConfigurationStringParser.Instance);
15+
});
16+
```
17+
18+
## Links
19+
20+
* [Documentation](https://nacos-sdk-csharp.readthedocs.io/en/latest/)
21+
* [nacos-sdk-csharp GitHub](https://github.com/nacos-group/nacos-sdk-csharp)

‎samples/MsConfigApp/Program.cs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,33 @@
2020

2121
builder.Services.AddControllers();
2222

23+
// NOTE: after v1.3.3
24+
// read configuration from config files
25+
// default parser is json
26+
builder.Host.UseNacosConfig(section: "NacosConfig");
27+
28+
// specify ini or yaml parser
29+
// builder.Host.UseNacosConfig(section: "NacosConfig", parser: Nacos.IniParser.IniConfigurationStringParser.Instance);
30+
// builder.Host.UseNacosConfig(section: "NacosConfig", parser: Nacos.YamlParser.YamlConfigurationStringParser.Instance);
31+
32+
/*
33+
NOTE: before v1.3.3
2334
builder.Host.ConfigureAppConfiguration((c, b) =>
2435
{
2536
var config = b.Build();
2637
2738
// read configuration from config files
2839
// default is json
2940
// b.AddNacosV2Configuration(config.GetSection("NacosConfig"));
30-
b.AddNacosV2Configuration(config.GetSection("NacosConfig"), logAction: x => x.AddSerilog(Log.Logger));
41+
b.AddNacosV2Configuration(config.GetSection("NacosConfig"));
3142
3243
// specify ini or yaml
33-
// b.AddNacosV2Configuration(config.GetSection("NacosConfig"), Nacos.IniParser.IniConfigurationStringParser.Instance);
34-
// b.AddNacosV2Configuration(config.GetSection("NacosConfig"), Nacos.YamlParser.YamlConfigurationStringParser.Instance);
35-
})
36-
.UseSerilog();
44+
b.AddNacosV2Configuration(config.GetSection("NacosConfig"), parser: Nacos.IniParser.IniConfigurationStringParser.Instance);
45+
b.AddNacosV2Configuration(config.GetSection("NacosConfig"), parser: Nacos.YamlParser.YamlConfigurationStringParser.Instance);
46+
});
47+
*/
48+
49+
builder.Host.UseSerilog();
3750

3851
var app = builder.Build();
3952

‎samples/MsConfigApp/README.md

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MsConfigApp
1+
# MsConfigApp
22

33
This sample shows how to integrate ASP.NET Core Configuration System.
44

@@ -37,7 +37,9 @@ https://nacos.io/en-us/docs/quick-start-docker.html
3737
"Password": "123456",
3838
"AccessKey": "",
3939
"SecretKey": "",
40-
"EndPoint": "acm.aliyun.com"
40+
"EndPoint": "acm.aliyun.com",
41+
"ConfigFilterAssemblies": [ "MsConfigApp" ],
42+
"ConfigFilterExtInfo": "{\"JsonPaths\":[\"ConnectionStrings.Default\"],\"Other\":\"xxxxxx\"}"
4143
}
4244
}
4345
```
@@ -69,10 +71,30 @@ The first one, its dataid is demo, group is DFAULT_GROUP and the value is as fol
6971
}
7072
```
7173

74+
> NOTE: If **ConfigFilterAssemblies** is not empty, using the following config value.
75+
76+
77+
```JSON
78+
{
79+
"ConnectionStrings": {
80+
"Default": "U2VydmVyPTEyNy4wLjAuMTtQb3J0PTMzMDY7RGF0YWJhc2U9ZGVtbztVc2VyIElkPXJvb3Q7UGFzc3dvcmQ9MTIzNDU2Ow=="
81+
},
82+
"version": "测试version",
83+
"AppSettings": {
84+
"Str": "val",
85+
"num": 1,
86+
"arr": [1, 2, 3],
87+
"subobj": {
88+
"a": "b"
89+
}
90+
}
91+
}
92+
```
93+
7294
The second one, its dataid is common, group is DFAULT_GROUP and the value is as following.
7395

7496
```JSON
7597
{
7698
"all": "test"
7799
}
78-
```
100+
```

‎src/Nacos.AspNetCore/Nacos.AspNetCore.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RepositoryUrl>https://github.com/nacos-group/nacos-sdk-csharp</RepositoryUrl>
1414
<ProjectUrl>https://github.com/nacos-group/nacos-sdk-csharp</ProjectUrl>
1515
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
1617
<PackageReleaseNotes>
1718
</PackageReleaseNotes>
1819
</PropertyGroup>
@@ -28,6 +29,7 @@
2829

2930
<ItemGroup>
3031
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
32+
<None Include="README.md" Pack="true" Visible="false" PackagePath="" />
3133
</ItemGroup>
3234

3335
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

‎src/Nacos.AspNetCore/README.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# nacos-sdk-csharp.AspNetCore
2+
3+
nacos-sdk-csharp.AspNetCore provides service registration and discovery With ASP.NET Core.
4+
5+
```csharp
6+
builder.Services.AddNacosAspNet(x =>
7+
{
8+
x.ServerAddresses = new List<string> { "http://localhost:8848/" };
9+
x.Namespace = "cs";
10+
x.ServiceName = "App2";
11+
x.GroupName = "DEFAULT_GROUP";
12+
x.ClusterName = "DEFAULT";
13+
x.Ip = "";
14+
x.PreferredNetworks = "";
15+
x.Port = 0;
16+
x.Weight = 100;
17+
x.RegisterEnabled = true;
18+
x.InstanceEnabled = true;
19+
x.Ephemeral = true;
20+
x.Secure = false;
21+
});
22+
23+
// or
24+
25+
builder.Services.AddNacosAspNet(builder.Configuration);
26+
```
27+
28+
## Links
29+
30+
* [Documentation](https://nacos-sdk-csharp.readthedocs.io/en/latest/)
31+
* [nacos-sdk-csharp GitHub](https://github.com/nacos-group/nacos-sdk-csharp)

‎src/Nacos.Microsoft.Extensions.Configuration/ConfigListener.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,5 @@ public class ConfigListener
1616
/// Configuration group
1717
/// </summary>
1818
public string Group { get; set; }
19-
20-
/// <summary>
21-
/// Tenant information. It corresponds to the Namespace field in Nacos.
22-
/// </summary>
23-
public string Tenant { get; set; }
2419
}
2520
}

‎src/Nacos.Microsoft.Extensions.Configuration/DefaultJsonConfigurationStringParser.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Nacos.Microsoft.Extensions.Configuration.Tests")]
2-
3-
namespace Nacos.Microsoft.Extensions.Configuration
1+
namespace Nacos.Microsoft.Extensions.Configuration
42
{
53
using global::Microsoft.Extensions.Configuration;
64
using Newtonsoft.Json;

‎src/Nacos.Microsoft.Extensions.Configuration/Nacos.Microsoft.Extensions.Configuration.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RepositoryUrl>https://github.com/nacos-group/nacos-sdk-csharp</RepositoryUrl>
1414
<ProjectUrl>https://github.com/nacos-group/nacos-sdk-csharp</ProjectUrl>
1515
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
1617
<PackageReleaseNotes>
1718
</PackageReleaseNotes>
1819
</PropertyGroup>
@@ -24,24 +25,30 @@
2425

2526
<ItemGroup>
2627
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
28+
<None Include="README.md" Pack="true" Visible="false" PackagePath="" />
2729
</ItemGroup>
2830

2931
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
3032
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
3133
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
3234
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
36+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
3337
</ItemGroup>
3438

3539
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
3640
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
3741
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
3842
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
44+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
3945
</ItemGroup>
4046

4147
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
4248
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
4349
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
4450
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
51+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
4552
</ItemGroup>
4653

4754
<ItemGroup>
@@ -51,5 +58,9 @@
5158
<ItemGroup>
5259
<ProjectReference Include="..\Nacos\Nacos.csproj" />
5360
</ItemGroup>
61+
62+
<ItemGroup>
63+
<InternalsVisibleTo Include="Nacos.Microsoft.Extensions.Configuration.Tests" />
64+
</ItemGroup>
5465

5566
</Project>

0 commit comments

Comments
 (0)