Merge branch 'ID-12903-2' into 'master'

inline Cement.Vokstok.Devtools.dll See merge request vostok-libraries/devtools!3
vostok · Aug 27, 2024 · 0bedd66 · 0bedd66
2 parents 053aff7 + 17fcb47
commit 0bedd66
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/dotnetcementrefs/dotnetcementrefs.csproj b/dotnetcementrefs/dotnetcementrefs.csproj
@@ -31,7 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../idevops.cement.cli/src/Cement.Vostok.Devtools/Cement.Vostok.Devtools.csproj"/>
+    <Reference Include="Cement.Vostok.Devtools" HintPath="../external/Cement.Vostok.Devtools.dll"/>
+    <PackageReference Include="SharpYaml" Version="2.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnetcementrefs/dotnetcementrefs.sln b/dotnetcementrefs/dotnetcementrefs.sln
@@ -5,6 +5,12 @@ VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnetcementrefs", "dotnetcementrefs.csproj", "{B9AD250D-90EC-4CE9-B466-C1BC0374DFB5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{6A51BC80-70C9-4C6B-B946-AC3A2F385499}"
+	ProjectSection(SolutionItems) = preProject
+		external\Cement.Vostok.Devtools.dll = external\Cement.Vostok.Devtools.dll
+		external\Cement.Vostok.Devtools.pdb = external\Cement.Vostok.Devtools.pdb
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/dotnetcementrefs/external/Cement.Vostok.Devtools.dll b/dotnetcementrefs/external/Cement.Vostok.Devtools.dll
diff --git a/module.yaml b/module.yaml
@@ -6,14 +6,11 @@ src:
 full-build:
   deps:
     - vostok.devtools.ilrepack.bin
-    - idevops.cement.cli/[email protected]
   build:
     target: None
     configuration: None
 
 dotnetcementrefs:
-  deps:
-    - idevops.cement.cli/[email protected]
   build:
     - name: Build
       tool: dotnet