Merge pull request #97 from Geta/develop

Moving nuget packaging to TeamCity;
Geta · Jun 12, 2020 · 026547a · 026547a
2 parents 60339f3 + 542fbdb
commit 026547a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/Geta.Tags.csproj b/src/Geta.Tags.csproj
@@ -233,7 +233,6 @@
     </None>
   </ItemGroup>
   <ItemGroup />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Import Project="$(SolutionDir)\src\msbuild\Main.proj" />
   <ProjectExtensions>
     <VisualStudio>

diff --git a/src/msbuild/Main.proj b/src/msbuild/Main.proj
@@ -46,12 +46,10 @@
 
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == ''">$(MSBuildProjectDirectory)\..\</SolutionDir>
-    <NuGetExe>$(SolutionDir)\.nuget\NuGet.exe</NuGetExe>
     <TmpOutDir>$(SolutionDir)\tmp</TmpOutDir>
-    <NuspecFile>$(SolutionDir)\src\Geta.Tags.nuspec</NuspecFile>
   </PropertyGroup>
 
-    <Target Name="CreateNugetPackage" AfterTargets="Build">
+    <Target Name="ZipDirectory" AfterTargets="Build">
       <PropertyGroup>
         <Version></Version>
       </PropertyGroup>
@@ -81,16 +79,9 @@
         OutputFileName="$(OutDir)\Geta.Tags.zip"
         OverwriteExistingFile="true" />
 
-      <!-- Create the package -->
-      <PropertyGroup>
-        <NugetCommand>
-          "$(NuGetExe)" pack "$(NuspecFile)" -OutputDirectory "$(OutDir.TrimEnd('\\'))" -Version "$(Version)" -Properties Configuration=$(Configuration)
-        </NugetCommand>
-
-      </PropertyGroup>
-      <Exec Command="$(NugetCommand)"/>
-
       <!-- Cleanup -->
       <RemoveDir Directories="$(TmpOutDir)" />
+
     </Target>
+
   </Project>