Skip to content

Commit b19b9e1

Browse files
kzukzu
committed
Move samples to a separate solution, ensure they reference built package
We won't build this sample for now in CI, since it's not even adding a very useful example at all (it was mostly brought from Merq). Pending rewrite or deletion?
1 parent c1684e7 commit b19b9e1

File tree

6 files changed

+56
-47
lines changed

6 files changed

+56
-47
lines changed

‎DependencyInjection.sln‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection.Tests",
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeAnalysis.Tests", "src\CodeAnalysis.Tests\CodeAnalysis.Tests.csproj", "{E512DEBA-FB35-47FD-AF25-3BAECCF667B1}"
1111
EndProject
12-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3C5A7AC8-E8CC-40D6-B472-A693F742152A}"
13-
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library1", "src\Samples\Library1\Library1.csproj", "{2BFDB11F-9503-4898-B348-BBE053A166B4}"
15-
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library2", "src\Samples\Library2\Library2.csproj", "{EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}"
17-
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\Samples\ConsoleApp\ConsoleApp.csproj", "{26EF99DB-D846-4F65-929D-D7E3E820423A}"
19-
EndProject
2012
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Attributed", "src\Attributed\Attributed.msbuildproj", "{1E68517F-34E7-415E-91B1-857802ED5592}"
2113
EndProject
2214
Global
@@ -37,18 +29,6 @@ Global
3729
{E512DEBA-FB35-47FD-AF25-3BAECCF667B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
3830
{E512DEBA-FB35-47FD-AF25-3BAECCF667B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
3931
{E512DEBA-FB35-47FD-AF25-3BAECCF667B1}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.Build.0 = Release|Any CPU
5232
{1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5333
{1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.Build.0 = Debug|Any CPU
5434
{1E68517F-34E7-415E-91B1-857802ED5592}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,11 +37,6 @@ Global
5737
GlobalSection(SolutionProperties) = preSolution
5838
HideSolutionNode = FALSE
5939
EndGlobalSection
60-
GlobalSection(NestedProjects) = preSolution
61-
{2BFDB11F-9503-4898-B348-BBE053A166B4} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A}
62-
{EB3F2D78-0F2C-4A1B-BD5E-E31299B67601} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A}
63-
{26EF99DB-D846-4F65-929D-D7E3E820423A} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A}
64-
EndGlobalSection
6540
GlobalSection(ExtensibilityGlobals) = postSolution
6641
SolutionGuid = {0B87CEC2-BB4D-4DAC-9C64-EB24C968C5D8}
6742
EndGlobalSection

‎src/Samples/ConsoleApp/ConsoleApp.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\..\DependencyInjection\Devlooped.Extensions.DependencyInjection.props" />
32

43
<PropertyGroup>
54
<OutputType>Exe</OutputType>
65
<TargetFramework>net6.0</TargetFramework>
76
<ImplicitUsings>true</ImplicitUsings>
8-
<!-- Allow inspection of generated code under obj -->
9-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
10-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
117
<WarningsAsErrors>true</WarningsAsErrors>
128
</PropertyGroup>
139

1410
<ItemGroup>
1511
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
12+
<PackageReference Include="Devlooped.Extensions.DependencyInjection" Version="42.*" />
1613
</ItemGroup>
1714

1815
<ItemGroup>
1916
<ProjectReference Include="..\Library1\Library1.csproj" Aliases="Library1" />
2017
<ProjectReference Include="..\Library2\Library2.csproj" Aliases="Library2" />
21-
<ProjectReference Include="..\..\DependencyInjection\DependencyInjection.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
2218
</ItemGroup>
2319

24-
<Import Project="..\..\DependencyInjection\Devlooped.Extensions.DependencyInjection.targets" />
2520
</Project>

‎src/Samples/DISample.sln‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.32916.344
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3C5A7AC8-E8CC-40D6-B472-A693F742152A}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library1", "Library1\Library1.csproj", "{2BFDB11F-9503-4898-B348-BBE053A166B4}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "ConsoleApp\ConsoleApp.csproj", "{26EF99DB-D846-4F65-929D-D7E3E820423A}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Library2", "Library2\Library2.csproj", "{628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}"
13+
EndProject
14+
Global
15+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16+
Debug|Any CPU = Debug|Any CPU
17+
Release|Any CPU = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Release|Any CPU.Build.0 = Release|Any CPU
32+
EndGlobalSection
33+
GlobalSection(SolutionProperties) = preSolution
34+
HideSolutionNode = FALSE
35+
EndGlobalSection
36+
GlobalSection(NestedProjects) = preSolution
37+
{2BFDB11F-9503-4898-B348-BBE053A166B4} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A}
38+
{26EF99DB-D846-4F65-929D-D7E3E820423A} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A}
39+
{628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A}
40+
EndGlobalSection
41+
GlobalSection(ExtensibilityGlobals) = postSolution
42+
SolutionGuid = {0B87CEC2-BB4D-4DAC-9C64-EB24C968C5D8}
43+
EndGlobalSection
44+
EndGlobal

‎src/Samples/Directory.Build.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
5+
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
6+
<RestoreSources>https://api.nuget.org/v3/index.json;$(MSBuildThisFileDirectory)../../bin;https://pkg.kzu.app/index.json</RestoreSources>
7+
</PropertyGroup>
8+
9+
<Import Project="..\Directory.Build.props"/>
10+
</Project>

‎src/Samples/Library1/Library1.csproj‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\..\DependencyInjection\Devlooped.Extensions.DependencyInjection.props" />
32

43
<PropertyGroup>
54
<TargetFramework>netstandard2.0</TargetFramework>
6-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
7-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
8-
<!-- Would otherwise be provided by the DependencyInjection.Attributed package -->
9-
<DefineConstants>DDI_ADDSERVICE</DefineConstants>
105
</PropertyGroup>
116

127
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
8+
<PackageReference Include="Devlooped.Extensions.DependencyInjection" Version="42.*" />
149
<PackageReference Include="PolySharp" PrivateAssets="all" Version="1.14.1" />
1510
<PackageReference Include="Merq" Version="2.0.0" />
1611
</ItemGroup>
1712

18-
<ItemGroup>
19-
<ProjectReference Include="..\..\DependencyInjection\DependencyInjection.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
20-
</ItemGroup>
21-
22-
<Import Project="..\..\DependencyInjection\Devlooped.Extensions.DependencyInjection.targets" />
2313
</Project>

‎src/Samples/Library2/Library2.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
65
</PropertyGroup>
76

87
<ItemGroup>
98
<PackageReference Include="PolySharp" PrivateAssets="all" Version="1.14.1" />
109
<PackageReference Include="Merq" Version="2.0.0" />
1110
</ItemGroup>
1211

13-
<ItemGroup>
14-
<ProjectReference Include="..\Library1\Library1.csproj" />
15-
</ItemGroup>
16-
1712
</Project>

0 commit comments

Comments
 (0)