Add Dumpify as submodule instead of dll

totollygeek · Apr 7, 2024 · 7484f2b · 7484f2b
1 parent 1f5fa25
commit 7484f2b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/.github/workflows/gh-actions.yml b/.github/workflows/gh-actions.yml
@@ -28,6 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          submodules: recursive
           fetch-depth: 0
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v3
@@ -57,6 +58,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          submodules: recursive
           fetch-depth: 0
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v3
@@ -86,6 +88,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          submodules: recursive
           fetch-depth: 0
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v3

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/Dumpify"]
+	path = external/Dumpify
+	url = https://github.com/totollygeek/Dumpify
diff --git a/awesome-app.sln b/awesome-app.sln
@@ -24,6 +24,10 @@ EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{8E438553-F16C-4098-AD7A-D093B0DE7A48}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dumpify", "external\Dumpify\src\Dumpify\Dumpify.csproj", "{1B6D2F81-0B59-4815-8B1B-5EE2E0E09329}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{3EF233C3-434F-4FF7-B461-19EE355E828C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -44,10 +48,15 @@ Global
 		{87C510AF-0D57-4CD7-B5EB-72EA26981612}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{87C510AF-0D57-4CD7-B5EB-72EA26981612}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87C510AF-0D57-4CD7-B5EB-72EA26981612}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B6D2F81-0B59-4815-8B1B-5EE2E0E09329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B6D2F81-0B59-4815-8B1B-5EE2E0E09329}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B6D2F81-0B59-4815-8B1B-5EE2E0E09329}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B6D2F81-0B59-4815-8B1B-5EE2E0E09329}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{32323913-6995-4632-9D11-BD2E306369AE} = {1B086AC7-8227-4E6B-8F8D-62DA74B0A799}
 		{8D419B5A-C7EF-436F-B6FB-8ADC04DDACD4} = {1B086AC7-8227-4E6B-8F8D-62DA74B0A799}
 		{87C510AF-0D57-4CD7-B5EB-72EA26981612} = {EDDBDF91-4E2E-499D-B2F8-155DB7980870}
+		{1B6D2F81-0B59-4815-8B1B-5EE2E0E09329} = {3EF233C3-434F-4FF7-B461-19EE355E828C}
 	EndGlobalSection
 EndGlobal
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,6 +25,8 @@ stages:
         displayName: 'Test'
         dependsOn: [  ]
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: 'Cache: nuke-temp'
             inputs:
@@ -58,6 +60,8 @@ stages:
         displayName: 'Test'
         dependsOn: [  ]
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: 'Cache: nuke-temp'
             inputs:
@@ -91,6 +95,8 @@ stages:
         displayName: 'Test'
         dependsOn: [  ]
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: 'Cache: nuke-temp'
             inputs:

diff --git a/build/Build.cs b/build/Build.cs
@@ -24,6 +24,7 @@
     GitHubActionsImage.WindowsLatest,
     GitHubActionsImage.MacOsLatest,
     FetchDepth = 0,
+    Submodules = GitHubActionsSubmodules.Recursive,
     OnPushBranches = [MainBranch],
     ImportSecrets = [nameof(NuGetApiKey)],
     PublishArtifacts = true,
@@ -34,6 +35,7 @@
     AzurePipelinesImage.UbuntuLatest,
     AzurePipelinesImage.WindowsLatest,
     AzurePipelinesImage.MacOsLatest,
+    Submodules = true,
     InvokedTargets = [nameof(PushPackages)],
     NonEntryTargets = [nameof(Clean), nameof(Restore), nameof(Compile), nameof(Pack), nameof(PushPackages)],
     ImportSecrets = [nameof(NuGetApiKey)])]

diff --git a/external/Dumpify b/external/Dumpify
diff --git a/src/awesome.app/awesome.app.csproj b/src/awesome.app/awesome.app.csproj
@@ -10,12 +10,12 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\external\Dumpify\src\Dumpify\Dumpify.csproj" />
         <ProjectReference Include="..\awesome.lib\awesome.lib.csproj" />
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-<!--        <PackageReference Include="Dumpify" Version="0.6.5" />-->
         <PackageReference Include="Spectre.Console" Version="0.48.1-preview.0.38" />
         <PackageReference Include="Spectre.Console.Cli" Version="0.48.1-preview.0.38" />
         <PackageReference Include="Spectre.Console.ImageSharp" Version="0.48.1-preview.0.38" />
@@ -26,11 +26,4 @@
           <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </EmbeddedResource>
     </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Dumpify">
-        <HintPath>..\..\..\Dumpify\src\Dumpify\bin\Debug\net8.0\Dumpify.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-
 </Project>