Update Pack workflow

dotnet · Jul 3, 2023 · 4e9edb0 · 4e9edb0
1 parent 74c1e13
commit 4e9edb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/build/Program.cs b/build/Program.cs
@@ -425,9 +425,7 @@ public override void Run(BuildContext context)
             Configuration = context.BuildConfiguration,
             OutputDirectory = context.ArtifactsDirectory.FullPath,
             ArgumentCustomization = args => args.Append("--include-symbols").Append("-p:SymbolPackageFormat=snupkg"),
-            MSBuildSettings = context.MsBuildSettingsPack,
-            NoBuild = true,
-            NoRestore = true
+            MSBuildSettings = context.MsBuildSettingsPack
         };
 
         foreach (var project in context.AllPackableSrcProjects)
@@ -436,8 +434,7 @@ public override void Run(BuildContext context)
         var settingsTemplate = new DotNetPackSettings
         {
             Configuration = context.BuildConfiguration,
-            OutputDirectory = context.ArtifactsDirectory.FullPath,
-            MSBuildSettings = context.MsBuildSettingsPack
+            OutputDirectory = context.ArtifactsDirectory.FullPath
         };
         context.DotNetPack(context.TemplatesTestsProjectFile.FullPath, settingsTemplate);
     }

diff --git a/build/common.props b/build/common.props
@@ -41,7 +41,7 @@
     <VersionPrefix Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(VersionSuffix)' == '' ">
+  <PropertyGroup Condition=" '$(VersionSuffix)' == '' AND '$(APPVEYOR_BUILD_NUMBER)' == '' ">
     <VersionSuffix>develop</VersionSuffix>
     <VersionSuffix Condition=" '$(APPVEYOR_BUILD_NUMBER)' == '' AND '$(BDN_CI_BUILD)' != '' ">ci</VersionSuffix>
   </PropertyGroup>