From 55d9a32e5f8917604c25d6ee6c15f23bd0ae6f90 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Thu, 4 May 2017 09:42:27 +0200 Subject: [PATCH] Add shared projects instead of linked files to improve code sharing (#209) --- .../SourceLink.Create.BitBucket.csproj | 6 +-- .../SourceLink.Create.CommandLine.csproj | 2 + .../SourceLink.Create.GitHub.csproj | 2 + .../GitCreateTask.cs | 0 .../SourceLink.Create.Shared.projitems | 14 +++++++ .../SourceLink.Create.Shared.shproj | 13 ++++++ .../SourceLink.Embed.AllSourceFiles.csproj | 3 +- .../SourceLink.Embed.PaketFiles.csproj | 3 +- .../SourceLink.Embed.Shared.projitems | 13 ++++++ .../SourceLink.Embed.Shared.shproj | 13 ++++++ .../Process.cs | 0 SourceLink.Shared/SourceLink.Shared.projitems | 14 +++++++ SourceLink.Shared/SourceLink.Shared.shproj | 13 ++++++ SourceLink.Test/SourceLink.Test.csproj | 5 +-- SourceLink.sln | 41 ++++++++++++++++++- .../dotnet-sourcelink-git.csproj | 6 +-- .../SourceLinkJson.cs | 0 .../System.cs | 0 .../Version.cs | 0 .../dotnet-sourcelink-shared.projitems | 16 ++++++++ .../dotnet-sourcelink-shared.shproj | 13 ++++++ dotnet-sourcelink/dotnet-sourcelink.csproj | 1 + 22 files changed, 161 insertions(+), 17 deletions(-) rename {SourceLink.Create.GitHub => SourceLink.Create.Shared}/GitCreateTask.cs (100%) create mode 100644 SourceLink.Create.Shared/SourceLink.Create.Shared.projitems create mode 100644 SourceLink.Create.Shared/SourceLink.Create.Shared.shproj create mode 100644 SourceLink.Embed.Shared/SourceLink.Embed.Shared.projitems create mode 100644 SourceLink.Embed.Shared/SourceLink.Embed.Shared.shproj rename {SourceLink.Create.GitHub => SourceLink.Shared}/Process.cs (100%) create mode 100644 SourceLink.Shared/SourceLink.Shared.projitems create mode 100644 SourceLink.Shared/SourceLink.Shared.shproj rename {dotnet-sourcelink => dotnet-sourcelink-shared}/SourceLinkJson.cs (100%) rename {dotnet-sourcelink => dotnet-sourcelink-shared}/System.cs (100%) rename {dotnet-sourcelink => dotnet-sourcelink-shared}/Version.cs (100%) create mode 100644 dotnet-sourcelink-shared/dotnet-sourcelink-shared.projitems create mode 100644 dotnet-sourcelink-shared/dotnet-sourcelink-shared.shproj diff --git a/SourceLink.Create.BitBucket/SourceLink.Create.BitBucket.csproj b/SourceLink.Create.BitBucket/SourceLink.Create.BitBucket.csproj index 7f1f823..6983ef2 100644 --- a/SourceLink.Create.BitBucket/SourceLink.Create.BitBucket.csproj +++ b/SourceLink.Create.BitBucket/SourceLink.Create.BitBucket.csproj @@ -6,10 +6,6 @@ false - - - - @@ -36,6 +32,8 @@ build/net461 + + \ No newline at end of file diff --git a/SourceLink.Create.CommandLine/SourceLink.Create.CommandLine.csproj b/SourceLink.Create.CommandLine/SourceLink.Create.CommandLine.csproj index 528a967..969c149 100644 --- a/SourceLink.Create.CommandLine/SourceLink.Create.CommandLine.csproj +++ b/SourceLink.Create.CommandLine/SourceLink.Create.CommandLine.csproj @@ -1,4 +1,6 @@  + + netstandard1.4;net461 diff --git a/SourceLink.Create.GitHub/SourceLink.Create.GitHub.csproj b/SourceLink.Create.GitHub/SourceLink.Create.GitHub.csproj index 19b4919..8c6fb6b 100644 --- a/SourceLink.Create.GitHub/SourceLink.Create.GitHub.csproj +++ b/SourceLink.Create.GitHub/SourceLink.Create.GitHub.csproj @@ -32,6 +32,8 @@ build/net461 + + \ No newline at end of file diff --git a/SourceLink.Create.GitHub/GitCreateTask.cs b/SourceLink.Create.Shared/GitCreateTask.cs similarity index 100% rename from SourceLink.Create.GitHub/GitCreateTask.cs rename to SourceLink.Create.Shared/GitCreateTask.cs diff --git a/SourceLink.Create.Shared/SourceLink.Create.Shared.projitems b/SourceLink.Create.Shared/SourceLink.Create.Shared.projitems new file mode 100644 index 0000000..2ccaab4 --- /dev/null +++ b/SourceLink.Create.Shared/SourceLink.Create.Shared.projitems @@ -0,0 +1,14 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 225d4dcf-82a5-49b0-8f45-7cbada058ca9 + + + SourceLink.Create + + + + + \ No newline at end of file diff --git a/SourceLink.Create.Shared/SourceLink.Create.Shared.shproj b/SourceLink.Create.Shared/SourceLink.Create.Shared.shproj new file mode 100644 index 0000000..dc86da2 --- /dev/null +++ b/SourceLink.Create.Shared/SourceLink.Create.Shared.shproj @@ -0,0 +1,13 @@ + + + + 225d4dcf-82a5-49b0-8f45-7cbada058ca9 + 14.0 + + + + + + + + diff --git a/SourceLink.Embed.AllSourceFiles/SourceLink.Embed.AllSourceFiles.csproj b/SourceLink.Embed.AllSourceFiles/SourceLink.Embed.AllSourceFiles.csproj index e663746..d8ff58e 100644 --- a/SourceLink.Embed.AllSourceFiles/SourceLink.Embed.AllSourceFiles.csproj +++ b/SourceLink.Embed.AllSourceFiles/SourceLink.Embed.AllSourceFiles.csproj @@ -1,4 +1,4 @@ - + netstandard1.4 false @@ -9,4 +9,5 @@ build + \ No newline at end of file diff --git a/SourceLink.Embed.PaketFiles/SourceLink.Embed.PaketFiles.csproj b/SourceLink.Embed.PaketFiles/SourceLink.Embed.PaketFiles.csproj index 6873105..ab02ab1 100644 --- a/SourceLink.Embed.PaketFiles/SourceLink.Embed.PaketFiles.csproj +++ b/SourceLink.Embed.PaketFiles/SourceLink.Embed.PaketFiles.csproj @@ -1,4 +1,4 @@ - + netstandard1.4 false @@ -9,4 +9,5 @@ build + \ No newline at end of file diff --git a/SourceLink.Embed.Shared/SourceLink.Embed.Shared.projitems b/SourceLink.Embed.Shared/SourceLink.Embed.Shared.projitems new file mode 100644 index 0000000..09c24d5 --- /dev/null +++ b/SourceLink.Embed.Shared/SourceLink.Embed.Shared.projitems @@ -0,0 +1,13 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 083cd576-0be4-4aac-86d8-00e50c660759 + + + SourceLink.Embed + + + + \ No newline at end of file diff --git a/SourceLink.Embed.Shared/SourceLink.Embed.Shared.shproj b/SourceLink.Embed.Shared/SourceLink.Embed.Shared.shproj new file mode 100644 index 0000000..101a800 --- /dev/null +++ b/SourceLink.Embed.Shared/SourceLink.Embed.Shared.shproj @@ -0,0 +1,13 @@ + + + + 083cd576-0be4-4aac-86d8-00e50c660759 + 14.0 + + + + + + + + diff --git a/SourceLink.Create.GitHub/Process.cs b/SourceLink.Shared/Process.cs similarity index 100% rename from SourceLink.Create.GitHub/Process.cs rename to SourceLink.Shared/Process.cs diff --git a/SourceLink.Shared/SourceLink.Shared.projitems b/SourceLink.Shared/SourceLink.Shared.projitems new file mode 100644 index 0000000..7295134 --- /dev/null +++ b/SourceLink.Shared/SourceLink.Shared.projitems @@ -0,0 +1,14 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + b1b7304a-fb72-435b-920f-b2dc53da6054 + + + SourceLink.Shared + + + + + \ No newline at end of file diff --git a/SourceLink.Shared/SourceLink.Shared.shproj b/SourceLink.Shared/SourceLink.Shared.shproj new file mode 100644 index 0000000..1e62369 --- /dev/null +++ b/SourceLink.Shared/SourceLink.Shared.shproj @@ -0,0 +1,13 @@ + + + + b1b7304a-fb72-435b-920f-b2dc53da6054 + 14.0 + + + + + + + + diff --git a/SourceLink.Test/SourceLink.Test.csproj b/SourceLink.Test/SourceLink.Test.csproj index d53c8ba..2fecf9d 100644 --- a/SourceLink.Test/SourceLink.Test.csproj +++ b/SourceLink.Test/SourceLink.Test.csproj @@ -32,10 +32,7 @@ build/net461 - - - - + \ No newline at end of file diff --git a/SourceLink.sln b/SourceLink.sln index ded8e59..4569fa3 100644 --- a/SourceLink.sln +++ b/SourceLink.sln @@ -25,11 +25,33 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceLink.Create.CommandLi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceLink.Create.BitBucket", "SourceLink.Create.BitBucket\SourceLink.Create.BitBucket.csproj", "{76CC64F0-2D47-4B3C-ADEA-6E758953F2D3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceLink.Embed.AllSourceFiles", "SourceLink.Embed.AllSourceFiles\SourceLink.Embed.AllSourceFiles.csproj", "{A791FDDC-9BAD-441B-9545-C26D2292E5C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceLink.Embed.AllSourceFiles", "SourceLink.Embed.AllSourceFiles\SourceLink.Embed.AllSourceFiles.csproj", "{A791FDDC-9BAD-441B-9545-C26D2292E5C3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceLink.Embed.PaketFiles", "SourceLink.Embed.PaketFiles\SourceLink.Embed.PaketFiles.csproj", "{81801FB5-9388-43BA-B8FD-508A428C03CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceLink.Embed.PaketFiles", "SourceLink.Embed.PaketFiles\SourceLink.Embed.PaketFiles.csproj", "{81801FB5-9388-43BA-B8FD-508A428C03CF}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "dotnet-sourcelink-shared", "dotnet-sourcelink-shared\dotnet-sourcelink-shared.shproj", "{FD0C81CE-4FAE-47CE-B89A-20F1DB6DAD0A}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SourceLink.Embed.Shared", "SourceLink.Embed.Shared\SourceLink.Embed.Shared.shproj", "{083CD576-0BE4-4AAC-86D8-00E50C660759}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{2402E19F-C4A4-43A4-B939-F5CD198EEED3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SourceLink", "SourceLink", "{07737978-28A8-42A2-A240-A66EF5EC4C5E}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SourceLink.Create.Shared", "SourceLink.Create.Shared\SourceLink.Create.Shared.shproj", "{225D4DCF-82A5-49B0-8F45-7CBADA058CA9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Create", "Create", "{F157756B-2442-4131-848B-CBEF39E8F706}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Embed", "Embed", "{CB177CE6-ADA8-4017-B5B3-579B72B67B2A}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SourceLink.Shared", "SourceLink.Shared\SourceLink.Shared.shproj", "{B1B7304A-FB72-435B-920F-B2DC53DA6054}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + SourceLink.Embed.Shared\SourceLink.Embed.Shared.projitems*{083cd576-0be4-4aac-86d8-00e50c660759}*SharedItemsImports = 13 + SourceLink.Create.Shared\SourceLink.Create.Shared.projitems*{225d4dcf-82a5-49b0-8f45-7cbada058ca9}*SharedItemsImports = 13 + SourceLink.Shared\SourceLink.Shared.projitems*{b1b7304a-fb72-435b-920f-b2dc53da6054}*SharedItemsImports = 13 + dotnet-sourcelink-shared\dotnet-sourcelink-shared.projitems*{fd0c81ce-4fae-47ce-b89a-20f1db6dad0a}*SharedItemsImports = 13 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 @@ -151,4 +173,19 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {68D40DAC-77EF-426A-979D-1CC4723CB2A1} = {2402E19F-C4A4-43A4-B939-F5CD198EEED3} + {5CEE8EC8-7A54-4860-8B5D-29F89D7F7F4C} = {F157756B-2442-4131-848B-CBEF39E8F706} + {87BCE13E-47FF-43A4-ADF4-F645FD4966AD} = {2402E19F-C4A4-43A4-B939-F5CD198EEED3} + {FB0D8C0B-27DF-4D20-9F15-09794D95F744} = {F157756B-2442-4131-848B-CBEF39E8F706} + {76CC64F0-2D47-4B3C-ADEA-6E758953F2D3} = {F157756B-2442-4131-848B-CBEF39E8F706} + {A791FDDC-9BAD-441B-9545-C26D2292E5C3} = {CB177CE6-ADA8-4017-B5B3-579B72B67B2A} + {81801FB5-9388-43BA-B8FD-508A428C03CF} = {CB177CE6-ADA8-4017-B5B3-579B72B67B2A} + {FD0C81CE-4FAE-47CE-B89A-20F1DB6DAD0A} = {2402E19F-C4A4-43A4-B939-F5CD198EEED3} + {083CD576-0BE4-4AAC-86D8-00E50C660759} = {CB177CE6-ADA8-4017-B5B3-579B72B67B2A} + {225D4DCF-82A5-49B0-8F45-7CBADA058CA9} = {F157756B-2442-4131-848B-CBEF39E8F706} + {F157756B-2442-4131-848B-CBEF39E8F706} = {07737978-28A8-42A2-A240-A66EF5EC4C5E} + {CB177CE6-ADA8-4017-B5B3-579B72B67B2A} = {07737978-28A8-42A2-A240-A66EF5EC4C5E} + {B1B7304A-FB72-435B-920F-B2DC53DA6054} = {07737978-28A8-42A2-A240-A66EF5EC4C5E} + EndGlobalSection EndGlobal diff --git a/dotnet-sourcelink-git/dotnet-sourcelink-git.csproj b/dotnet-sourcelink-git/dotnet-sourcelink-git.csproj index 9321165..08bf547 100644 --- a/dotnet-sourcelink-git/dotnet-sourcelink-git.csproj +++ b/dotnet-sourcelink-git/dotnet-sourcelink-git.csproj @@ -6,15 +6,11 @@ DotnetCliTool SourceLink.Git - - - - - + \ No newline at end of file diff --git a/dotnet-sourcelink/SourceLinkJson.cs b/dotnet-sourcelink-shared/SourceLinkJson.cs similarity index 100% rename from dotnet-sourcelink/SourceLinkJson.cs rename to dotnet-sourcelink-shared/SourceLinkJson.cs diff --git a/dotnet-sourcelink/System.cs b/dotnet-sourcelink-shared/System.cs similarity index 100% rename from dotnet-sourcelink/System.cs rename to dotnet-sourcelink-shared/System.cs diff --git a/dotnet-sourcelink/Version.cs b/dotnet-sourcelink-shared/Version.cs similarity index 100% rename from dotnet-sourcelink/Version.cs rename to dotnet-sourcelink-shared/Version.cs diff --git a/dotnet-sourcelink-shared/dotnet-sourcelink-shared.projitems b/dotnet-sourcelink-shared/dotnet-sourcelink-shared.projitems new file mode 100644 index 0000000..317e814 --- /dev/null +++ b/dotnet-sourcelink-shared/dotnet-sourcelink-shared.projitems @@ -0,0 +1,16 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + fd0c81ce-4fae-47ce-b89a-20f1db6dad0a + + + SourceLink + + + + + + + \ No newline at end of file diff --git a/dotnet-sourcelink-shared/dotnet-sourcelink-shared.shproj b/dotnet-sourcelink-shared/dotnet-sourcelink-shared.shproj new file mode 100644 index 0000000..1a644c2 --- /dev/null +++ b/dotnet-sourcelink-shared/dotnet-sourcelink-shared.shproj @@ -0,0 +1,13 @@ + + + + fd0c81ce-4fae-47ce-b89a-20f1db6dad0a + 14.0 + + + + + + + + diff --git a/dotnet-sourcelink/dotnet-sourcelink.csproj b/dotnet-sourcelink/dotnet-sourcelink.csproj index 327ca0a..d09e03a 100644 --- a/dotnet-sourcelink/dotnet-sourcelink.csproj +++ b/dotnet-sourcelink/dotnet-sourcelink.csproj @@ -12,5 +12,6 @@ + \ No newline at end of file