Skip to content

Commit ab40105

Browse files
authored
Merge pull request #208 from pengweiqhca/main
Adjust solution structure.
2 parents c2baf6b + 4f94e47 commit ab40105

File tree

168 files changed

+163
-157
lines changed

Some content is hidden

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

168 files changed

+163
-157
lines changed

Diff for: Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj

-13
This file was deleted.

Diff for: Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj

-19
This file was deleted.

Diff for: Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj

-17
This file was deleted.

Diff for: Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj

-15
This file was deleted.

Diff for: Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj

-18
This file was deleted.

Diff for: Apollo.sln

+25-18
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31825.309
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Demo", "Apollo.Configuration.Demo\Apollo.Configuration.Demo.csproj", "{D78C920D-C96B-4973-BBC8-35E5DB54DF2A}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Demo", "demo\Apollo.Configuration.Demo\Apollo.Configuration.Demo.csproj", "{D78C920D-C96B-4973-BBC8-35E5DB54DF2A}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo", "Apollo\Apollo.csproj", "{B231A39E-9D8A-4F63-9DFF-4FB7B5A900AB}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo", "src\Apollo\Apollo.csproj", "{B231A39E-9D8A-4F63-9DFF-4FB7B5A900AB}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration", "Apollo.Configuration\Apollo.Configuration.csproj", "{5AE563BF-2E6F-4096-A324-7A5A72B2CBAC}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration", "src\Apollo.Configuration\Apollo.Configuration.csproj", "{5AE563BF-2E6F-4096-A324-7A5A72B2CBAC}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager", "Apollo.ConfigurationManager\Apollo.ConfigurationManager.csproj", "{CE700879-20DD-4FAE-B431-884802B99A2D}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager", "src\Apollo.ConfigurationManager\Apollo.ConfigurationManager.csproj", "{CE700879-20DD-4FAE-B431-884802B99A2D}"
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{52301167-7BBA-48C2-BA36-08270D57D2C4}"
1515
ProjectSection(SolutionItems) = preProject
@@ -19,41 +19,48 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1919
azure-pipelines.yml = azure-pipelines.yml
2020
Directory.Build.props = Directory.Build.props
2121
Directory.Build.targets = Directory.Build.targets
22-
PackAllProject.ps1 = PackAllProject.ps1
2322
README.md = README.md
2423
EndProjectSection
2524
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Demo", "Apollo.ConfigurationManager.Demo\Apollo.ConfigurationManager.Demo.csproj", "{51A78BF1-4708-45EC-9F2E-59A24D64DB05}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Demo", "demo\Apollo.ConfigurationManager.Demo\Apollo.ConfigurationManager.Demo.csproj", "{51A78BF1-4708-45EC-9F2E-59A24D64DB05}"
2726
EndProject
2827
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{12417079-E62C-4F29-ADDE-5EABD77331E2}"
2928
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apollo.AspNet.Demo", "Apollo.AspNet.Demo\Apollo.AspNet.Demo.csproj", "{E1EF936E-182E-47BD-B658-87C0D872AB0C}"
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apollo.AspNet.Demo", "demo\Apollo.AspNet.Demo\Apollo.AspNet.Demo.csproj", "{E1EF936E-182E-47BD-B658-87C0D872AB0C}"
3130
EndProject
3231
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9CB5265-6B89-42F1-BA20-2F85427359E7}"
32+
ProjectSection(SolutionItems) = preProject
33+
src\Directory.Build.props = src\Directory.Build.props
34+
src\Directory.Build.targets = src\Directory.Build.targets
35+
src\PackAllProject.ps1 = src\PackAllProject.ps1
36+
EndProjectSection
3337
EndProject
3438
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{24717111-7EE5-4F52-B1BA-328167E51C91}"
39+
ProjectSection(SolutionItems) = preProject
40+
test\Directory.Build.targets = test\Directory.Build.targets
41+
EndProjectSection
3542
EndProject
36-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Tests", "Apollo.Configuration.Tests\Apollo.Configuration.Tests.csproj", "{BBD59F3E-FB5A-4972-8195-AC980E9677FD}"
43+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Tests", "test\Apollo.Configuration.Tests\Apollo.Configuration.Tests.csproj", "{BBD59F3E-FB5A-4972-8195-AC980E9677FD}"
3744
EndProject
38-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Tests", "Apollo.Tests\Apollo.Tests.csproj", "{0E0A93F8-27ED-4114-81CB-AA6250EF8CDD}"
45+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Tests", "test\Apollo.Tests\Apollo.Tests.csproj", "{0E0A93F8-27ED-4114-81CB-AA6250EF8CDD}"
3946
EndProject
40-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Tests", "Apollo.ConfigurationManager.Tests\Apollo.ConfigurationManager.Tests.csproj", "{0F441878-CCF9-40EB-B190-825D86883920}"
47+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Tests", "test\Apollo.ConfigurationManager.Tests\Apollo.ConfigurationManager.Tests.csproj", "{0F441878-CCF9-40EB-B190-825D86883920}"
4148
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCore.Demo", "Apollo.AspNetCore.Demo\Apollo.AspNetCore.Demo.csproj", "{8D1A9478-6E11-4FB2-8537-E7497E004612}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCore.Demo", "demo\Apollo.AspNetCore.Demo\Apollo.AspNetCore.Demo.csproj", "{8D1A9478-6E11-4FB2-8537-E7497E004612}"
4350
EndProject
44-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml", "Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj", "{DA39FFF7-0FC5-4F5B-8224-AA8E3026BBC0}"
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml", "src\Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj", "{DA39FFF7-0FC5-4F5B-8224-AA8E3026BBC0}"
4552
EndProject
46-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml.Tests", "Apollo.ConfigAdapter.Yaml.Tests\Apollo.ConfigAdapter.Yaml.Tests.csproj", "{8E91B287-88A7-4AAA-B5E2-6ED46C2DBC2D}"
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml.Tests", "test\Apollo.ConfigAdapter.Yaml.Tests\Apollo.ConfigAdapter.Yaml.Tests.csproj", "{8E91B287-88A7-4AAA-B5E2-6ED46C2DBC2D}"
4754
EndProject
48-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi", "Apollo.OpenApi\Apollo.OpenApi.csproj", "{D3A91B3E-3C8E-429F-A5BA-B3178AB1D5A1}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi", "src\Apollo.OpenApi\Apollo.OpenApi.csproj", "{D3A91B3E-3C8E-429F-A5BA-B3178AB1D5A1}"
4956
EndProject
50-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.DependencyInjection", "Apollo.OpenApi.DependencyInjection\Apollo.OpenApi.DependencyInjection.csproj", "{DF925964-C88B-4DCC-8509-EAB1847D1B05}"
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.DependencyInjection", "src\Apollo.OpenApi.DependencyInjection\Apollo.OpenApi.DependencyInjection.csproj", "{DF925964-C88B-4DCC-8509-EAB1847D1B05}"
5158
EndProject
52-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.Tests", "Apollo.OpenApi.Tests\Apollo.OpenApi.Tests.csproj", "{62AB1893-C173-41C7-9884-46A199244B13}"
59+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.Tests", "test\Apollo.OpenApi.Tests\Apollo.OpenApi.Tests.csproj", "{62AB1893-C173-41C7-9884-46A199244B13}"
5360
EndProject
54-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ExtensionsHosting", "Apollo.ExtensionsHosting\Apollo.ExtensionsHosting.csproj", "{65DED7CA-9B84-45AE-84D4-13400A3842D7}"
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ExtensionsHosting", "src\Apollo.ExtensionsHosting\Apollo.ExtensionsHosting.csproj", "{65DED7CA-9B84-45AE-84D4-13400A3842D7}"
5562
EndProject
56-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCoreHosting", "Apollo.AspNetCoreHosting\Apollo.AspNetCoreHosting.csproj", "{78AB89DD-1D81-4619-8750-2DABDA071FD4}"
63+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCoreHosting", "src\Apollo.AspNetCoreHosting\Apollo.AspNetCoreHosting.csproj", "{78AB89DD-1D81-4619-8750-2DABDA071FD4}"
5764
EndProject
5865
Global
5966
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Diff for: Directory.Build.props

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
<Project>
22

33
<PropertyGroup>
4-
<ApolloVersion>2.9</ApolloVersion>
5-
<AssemblyOriginatorKeyFile>..\Apollo.snk</AssemblyOriginatorKeyFile>
6-
<AssemblyVersion>$(ApolloVersion).0</AssemblyVersion>
7-
<DebugSymbols>True</DebugSymbols>
8-
<GenerateDocumentationFile>True</GenerateDocumentationFile>
9-
<GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">True</GeneratePackageOnBuild>
10-
<IncludeSymbols>True</IncludeSymbols>
4+
<AssemblyOriginatorKeyFile>..\..\Apollo.snk</AssemblyOriginatorKeyFile>
115
<ImplicitUsings>enable</ImplicitUsings>
126
<LangVersion>10.0</LangVersion>
137
<Nullable>enable</Nullable>
148
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
159
<NoWarn>$(NoWarn);CS0414;CS0436;CS1591</NoWarn>
16-
<PackageIcon>icon.png</PackageIcon>
17-
<PackageTags>apollo configcenter configuration ctrip</PackageTags><PackageIcon>icon.png</PackageIcon>
18-
<RepositoryType>git</RepositoryType>
19-
<RepositoryUrl>https://github.com/apolloconfig/apollo.net/tree/main</RepositoryUrl>
2010
<SignAssembly>true</SignAssembly>
2111
</PropertyGroup>
2212

@@ -29,13 +19,4 @@
2919
<Using Include="System.Text" />
3020
</ItemGroup>
3121

32-
<ItemGroup>
33-
<None Include="..\icon.png" Pack="true" PackagePath="\" Visible="false" />
34-
35-
<PackageReference Include="IsExternalInit" Version="1.*" PrivateAssets="All" />
36-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.*" PrivateAssets="All" />
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
38-
<PackageReference Include="Nullable" Version="1.*" PrivateAssets="All" />
39-
</ItemGroup>
40-
4122
</Project>

Diff for: Directory.Build.targets

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<PackageProjectUrl>$(RepositoryUrl)/$(MSBuildProjectName)</PackageProjectUrl>
5-
</PropertyGroup>
3+
<ItemGroup>
4+
<PackageReference Include="IsExternalInit" Version="1.*" PrivateAssets="All" />
5+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.*" PrivateAssets="All" />
6+
<PackageReference Include="Nullable" Version="1.*" PrivateAssets="All" />
7+
</ItemGroup>
68

79
</Project>

Diff for: README.md

+2-2

Diff for: Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj renamed to demo/Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@
6161
<Compile Include="Startup.cs" />
6262
</ItemGroup>
6363
<ItemGroup>
64-
<ProjectReference Include="..\Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj">
64+
<ProjectReference Include="..\..\src\Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj">
6565
<Project>{da39fff7-0fc5-4f5b-8224-aa8e3026bbc0}</Project>
6666
<Name>Apollo.ConfigAdapter.Yaml</Name>
6767
</ProjectReference>
68-
<ProjectReference Include="..\Apollo.ConfigurationManager\Apollo.ConfigurationManager.csproj">
68+
<ProjectReference Include="..\..\src\Apollo.ConfigurationManager\Apollo.ConfigurationManager.csproj">
6969
<Project>{ce700879-20dd-4fae-b431-884802b99a2d}</Project>
7070
<Name>Apollo.ConfigurationManager</Name>
7171
</ProjectReference>
72-
<ProjectReference Include="..\Apollo.Configuration\Apollo.Configuration.csproj">
72+
<ProjectReference Include="..\..\src\Apollo.Configuration\Apollo.Configuration.csproj">
7373
<Project>{5ae563bf-2e6f-4096-a324-7a5a72b2cbac}</Project>
7474
<Name>Apollo.Configuration</Name>
7575
</ProjectReference>
76-
<ProjectReference Include="..\Apollo\Apollo.csproj">
76+
<ProjectReference Include="..\..\src\Apollo\Apollo.csproj">
7777
<Project>{b231a39e-9d8a-4f63-9dff-4fb7b5a900ab}</Project>
7878
<Name>Apollo</Name>
7979
</ProjectReference>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\src\Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj" />
9+
<ProjectReference Include="..\..\src\Apollo.ExtensionsHosting\Apollo.ExtensionsHosting.csproj" />
10+
</ItemGroup>
11+
12+
</Project>
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Worker">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<OutputType>Exe</OutputType>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.*" />
10+
11+
<ProjectReference Include="..\..\src\Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj" />
12+
<ProjectReference Include="..\..\src\Apollo.Configuration\Apollo.Configuration.csproj" />
13+
<ProjectReference Include="..\..\src\Apollo.ExtensionsHosting\Apollo.ExtensionsHosting.csproj" />
14+
</ItemGroup>
15+
16+
</Project>
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net45</TargetFramework>
5+
<OutputType>Exe</OutputType>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<ProjectReference Include="..\..\src\Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj" />
10+
<ProjectReference Include="..\..\src\Apollo.ConfigurationManager\Apollo.ConfigurationManager.csproj" />
11+
<ProjectReference Include="..\..\src\Apollo\Apollo.csproj" />
12+
</ItemGroup>
13+
14+
</Project>
File renamed without changes.

Diff for: Apollo.Configuration/README.md renamed to src/Apollo.Configuration/README.md

+3-3

Diff for: Apollo.ConfigurationManager/README.md renamed to src/Apollo.ConfigurationManager/README.md

+3-3
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)