From b19b9e1e8e1e18f4902054c251b22bec2796edd1 Mon Sep 17 00:00:00 2001 From: Daniel Cazzulino Date: Tue, 3 Dec 2024 17:55:21 -0300 Subject: [PATCH] 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? --- DependencyInjection.sln | 25 -------------- src/Samples/ConsoleApp/ConsoleApp.csproj | 7 +--- src/Samples/DISample.sln | 44 ++++++++++++++++++++++++ src/Samples/Directory.Build.props | 10 ++++++ src/Samples/Library1/Library1.csproj | 12 +------ src/Samples/Library2/Library2.csproj | 5 --- 6 files changed, 56 insertions(+), 47 deletions(-) create mode 100644 src/Samples/DISample.sln create mode 100644 src/Samples/Directory.Build.props diff --git a/DependencyInjection.sln b/DependencyInjection.sln index a8dd488..690fe17 100644 --- a/DependencyInjection.sln +++ b/DependencyInjection.sln @@ -9,14 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection.Tests", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeAnalysis.Tests", "src\CodeAnalysis.Tests\CodeAnalysis.Tests.csproj", "{E512DEBA-FB35-47FD-AF25-3BAECCF667B1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3C5A7AC8-E8CC-40D6-B472-A693F742152A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library1", "src\Samples\Library1\Library1.csproj", "{2BFDB11F-9503-4898-B348-BBE053A166B4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library2", "src\Samples\Library2\Library2.csproj", "{EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\Samples\ConsoleApp\ConsoleApp.csproj", "{26EF99DB-D846-4F65-929D-D7E3E820423A}" -EndProject Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Attributed", "src\Attributed\Attributed.msbuildproj", "{1E68517F-34E7-415E-91B1-857802ED5592}" EndProject Global @@ -37,18 +29,6 @@ Global {E512DEBA-FB35-47FD-AF25-3BAECCF667B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {E512DEBA-FB35-47FD-AF25-3BAECCF667B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {E512DEBA-FB35-47FD-AF25-3BAECCF667B1}.Release|Any CPU.Build.0 = Release|Any CPU - {2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.Build.0 = Release|Any CPU - {EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB3F2D78-0F2C-4A1B-BD5E-E31299B67601}.Release|Any CPU.Build.0 = Release|Any CPU - {26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.Build.0 = Release|Any CPU {1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.Build.0 = Debug|Any CPU {1E68517F-34E7-415E-91B1-857802ED5592}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -57,11 +37,6 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2BFDB11F-9503-4898-B348-BBE053A166B4} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A} - {EB3F2D78-0F2C-4A1B-BD5E-E31299B67601} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A} - {26EF99DB-D846-4F65-929D-D7E3E820423A} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B87CEC2-BB4D-4DAC-9C64-EB24C968C5D8} EndGlobalSection diff --git a/src/Samples/ConsoleApp/ConsoleApp.csproj b/src/Samples/ConsoleApp/ConsoleApp.csproj index 32cbdf0..40c131b 100644 --- a/src/Samples/ConsoleApp/ConsoleApp.csproj +++ b/src/Samples/ConsoleApp/ConsoleApp.csproj @@ -1,25 +1,20 @@  - Exe net6.0 true - - true - false true + - - diff --git a/src/Samples/DISample.sln b/src/Samples/DISample.sln new file mode 100644 index 0000000..2641bbe --- /dev/null +++ b/src/Samples/DISample.sln @@ -0,0 +1,44 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.32916.344 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3C5A7AC8-E8CC-40D6-B472-A693F742152A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library1", "Library1\Library1.csproj", "{2BFDB11F-9503-4898-B348-BBE053A166B4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "ConsoleApp\ConsoleApp.csproj", "{26EF99DB-D846-4F65-929D-D7E3E820423A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Library2", "Library2\Library2.csproj", "{628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2BFDB11F-9503-4898-B348-BBE053A166B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2BFDB11F-9503-4898-B348-BBE053A166B4}.Release|Any CPU.Build.0 = Release|Any CPU + {26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.Build.0 = Release|Any CPU + {628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {2BFDB11F-9503-4898-B348-BBE053A166B4} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A} + {26EF99DB-D846-4F65-929D-D7E3E820423A} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A} + {628BF7AC-CADB-E845-D0A3-82D0FCBCA4DC} = {3C5A7AC8-E8CC-40D6-B472-A693F742152A} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0B87CEC2-BB4D-4DAC-9C64-EB24C968C5D8} + EndGlobalSection +EndGlobal diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props new file mode 100644 index 0000000..11f86cd --- /dev/null +++ b/src/Samples/Directory.Build.props @@ -0,0 +1,10 @@ + + + + false + true + https://api.nuget.org/v3/index.json;$(MSBuildThisFileDirectory)../../bin;https://pkg.kzu.app/index.json + + + + diff --git a/src/Samples/Library1/Library1.csproj b/src/Samples/Library1/Library1.csproj index ba2a740..19c6bc1 100644 --- a/src/Samples/Library1/Library1.csproj +++ b/src/Samples/Library1/Library1.csproj @@ -1,23 +1,13 @@  - netstandard2.0 - false - true - - DDI_ADDSERVICE - + - - - - - diff --git a/src/Samples/Library2/Library2.csproj b/src/Samples/Library2/Library2.csproj index 6cb17ab..8385702 100644 --- a/src/Samples/Library2/Library2.csproj +++ b/src/Samples/Library2/Library2.csproj @@ -2,7 +2,6 @@ netstandard2.0 - false @@ -10,8 +9,4 @@ - - - -