Skip to content

Commit 83b715b

Browse files
maikebingmaikebing
committed
本地和远程文件一致时不加载的问题
1 parent 52bf8ca commit 83b715b

File tree

10 files changed

+21
-26
lines changed

10 files changed

+21
-26
lines changed

‎Extensions.Configuration.GitRepository.GitHubProvider/Extensions.Configuration.GitRepository.GitHubProvider.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
23-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.*" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.*" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.*" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

‎Extensions.Configuration.GitRepository.GitLabProvider/Extensions.Configuration.GitRepository.GitLabProvider.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
23-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.*" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.*" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.*" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -43,7 +43,7 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="NGitLab" Version="8.3.0" />
46+
<PackageReference Include="NGitLab" Version="8.4.0" />
4747
</ItemGroup>
4848

4949
<ItemGroup>

‎Extensions.Configuration.GitRepository.GitLabProvider/GitLabRepositoryClient.cs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ private void check_connect()
2020
if (client == null)
2121
{
2222
client = new NGitLab.GitLabClient(_options.HostUrl, _options.AuthenticationToken);
23+
2324
}
2425
if (project == null || repo == null)
2526
{

‎Extensions.Configuration.GitRepository.GiteaProvider/Extensions.Configuration.GitRepository.GiteaProvider.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
23-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.*" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.*" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.*" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

‎Extensions.Configuration.GitRepository.GiteeProvider/Extensions.Configuration.GitRepository.GiteeProvider.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
23-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.*" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.*" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.*" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

‎Extensions.Configuration.GitRepository.TestProject/Extensions.Configuration.GitRepository.TestProject.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.*" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.*" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎Extensions.Configuration.GitRepository.TestProject/TestGitRepositoryProvides.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void TestCleanup()
1717
}
1818

1919
[TestMethod]
20-
[DataRow("GitLab", "https://gitlab.com/", "maikebing/gitcfg", "WithGitLab", typeof(GitLabProviderExtensions), null, DisplayName = "GitLabProvider")]
20+
[DataRow("GitLab", "https://gitlab.com/", "maikebing/gitcfg", "WithGitLab", typeof(GitLabProviderExtensions), "http://127.0.0.1:7890", DisplayName = "GitLabProvider")]
2121
[DataRow("GitHub", "https://github.com/", "maikebing/gitcfg", "WithGitHub", typeof(GitHubProviderExtensions), "http://127.0.0.1:7890", DisplayName = "GitHubProvider")]
2222
[DataRow("GitHub", "https://github.com/", "8f00a80b168022dbfec1769c3ae8145c", "WithGitHubGist", typeof(GitHubProviderExtensions), "http://127.0.0.1:7890", DisplayName = "GitHubProvider")]
2323
[DataRow("Gitee", "https://gitee.com/", "maikebing/gitcfg", "WithGitee", typeof(GiteeProviderExtensions), null, DisplayName = "GiteeProvider")]

‎Extensions.Configuration.GitRepository.sln

-6
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo", "Demo\Demo.csproj",
1616
EndProject
1717
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Extensions.Configuration.GitRepository", "Extensions.Configuration.GitRepository\Extensions.Configuration.GitRepository.csproj", "{2E05C6F1-193F-D1EC-0489-44F1AB614E05}"
1818
EndProject
19-
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{81DDED9D-158B-E303-5F62-77A2896D2A5A}"
20-
EndProject
2119
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoUseStartup", "DemoUseStartup\DemoUseStartup.csproj", "{4FA5BE90-5FF6-47F8-AC61-28F184C951F7}"
2220
EndProject
2321
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Extensions.Configuration.GitRepository.GitLabProvider", "Extensions.Configuration.GitRepository.GitLabProvider\Extensions.Configuration.GitRepository.GitLabProvider.csproj", "{5E532959-FB2D-43B4-9004-61508E412FB3}"
@@ -44,10 +42,6 @@ Global
4442
{2E05C6F1-193F-D1EC-0489-44F1AB614E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
4543
{2E05C6F1-193F-D1EC-0489-44F1AB614E05}.Release|Any CPU.ActiveCfg = Release|Any CPU
4644
{2E05C6F1-193F-D1EC-0489-44F1AB614E05}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Release|Any CPU.Build.0 = Release|Any CPU
5145
{4FA5BE90-5FF6-47F8-AC61-28F184C951F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5246
{4FA5BE90-5FF6-47F8-AC61-28F184C951F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
5347
{4FA5BE90-5FF6-47F8-AC61-28F184C951F7}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎Extensions.Configuration.GitRepository/Extensions.Configuration.GitRepository.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
22-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.*" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.*" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.*" />
2525
</ItemGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

‎Extensions.Configuration.GitRepository/GitRepositoryConfigurationProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private void SyncGitRepoFile()
6565
_jsonData = ReadCache();
6666
}
6767
bool result= ReadGitRepo( ref _jsonData);
68-
if (_jsonData != null && result)
68+
if (_jsonData != null && (result || Data?.Count==0 ) )
6969
{
7070
Data = JsonConfigurationFileParser.Parse(_jsonData);
7171
OnReload();

0 commit comments

Comments
 (0)