From 46078f6e39f0826aaf769898acd329a3f204d4b0 Mon Sep 17 00:00:00 2001
From: Travis Illig <travis.illig@fiserv.com>
Date: Wed, 16 Aug 2017 13:30:23 -0700
Subject: [PATCH] Updated build scripts/ruleset to latest from core Autofac.

---
 build/Analyzers.ruleset  |  6 ++++++
 build/Autofac.Build.psd1 |  2 +-
 build/Autofac.Build.psm1 | 29 ++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/build/Analyzers.ruleset b/build/Analyzers.ruleset
index 8e76993..8f85d10 100644
--- a/build/Analyzers.ruleset
+++ b/build/Analyzers.ruleset
@@ -2,6 +2,12 @@
 <RuleSet Name="Autofac Analyzer Rules" Description="Analyzer rules for Autofac assemblies." ToolsVersion="14.0">
   <!-- https://github.com/dotnet/roslyn/blob/master/docs/compilers/Rule%20Set%20Format.md -->
   <IncludeAll Action="Warning" />
+  <Rules AnalyzerId="Microsoft.Usage" RuleNamespace="Microsoft.Usage">
+    <!-- Implement serialization constructors - false positive when building .NET Core -->
+    <Rule Id="CA2229" Action="None" />
+    <!-- Mark ISerializable types with SerializableAttribute - false positive when building .NET Core -->
+    <Rule Id="CA2237" Action="None" />
+  </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <!-- Prefix local calls with this -->
     <Rule Id="SA1101" Action="None" />
diff --git a/build/Autofac.Build.psd1 b/build/Autofac.Build.psd1
index 26e59f2..5d93715 100644
--- a/build/Autofac.Build.psd1
+++ b/build/Autofac.Build.psd1
@@ -1,6 +1,6 @@
 @{
     RootModule = '.\Autofac.Build.psm1'
-    ModuleVersion = '0.1.0'
+    ModuleVersion = '0.2.0'
     GUID = '55d3f738-f48f-4497-9b2c-ecd90ec1f978'
     Author = 'Autofac Contributors'
     CompanyName = 'Autofac'
diff --git a/build/Autofac.Build.psm1 b/build/Autofac.Build.psm1
index d36e951..75ba688 100644
--- a/build/Autofac.Build.psm1
+++ b/build/Autofac.Build.psm1
@@ -145,9 +145,9 @@ function Invoke-DotNetPack
     $PackagesPath,
 
     [Parameter(Mandatory=$True, ValueFromPipeline=$False)]
-    [ValidateNotNull()]
-    [System.IO.DirectoryInfo]
-    $VersionSuffix
+    [AllowEmptyString()]
+    [string]
+    $VersionSuffix = ""
   )
   Begin
   {
@@ -157,8 +157,27 @@ function Invoke-DotNetPack
   {
     foreach($Project in $ProjectDirectory)
     {
-      & dotnet build ("""" + $Project.FullName + """") --configuration Release --version-suffix $VersionSuffix
-      & dotnet pack ("""" + $Project.FullName + """") --configuration Release --version-suffix $VersionSuffix --include-symbols --output $PackagesPath
+      if ($VersionSuffix -eq "")
+      {
+        & dotnet build ("""" + $Project.FullName + """") --configuration Release
+      }
+      else
+      {
+        & dotnet build ("""" + $Project.FullName + """") --configuration Release --version-suffix $VersionSuffix
+      }
+      if ($LASTEXITCODE -ne 0)
+      {
+        exit 1
+      }
+
+      if ($VersionSuffix -eq "")
+      {
+        & dotnet pack ("""" + $Project.FullName + """") --configuration Release --include-symbols --output $PackagesPath
+      }
+      else
+      {
+        & dotnet pack ("""" + $Project.FullName + """") --configuration Release --version-suffix $VersionSuffix --include-symbols --output $PackagesPath
+      }
       if ($LASTEXITCODE -ne 0)
       {
         exit 1