Falling back to embeded pdb

Snupgk seems to be unsupported by fody at the moment jbevain/cecil#610 ltrzesniewski/InlineIL.Fody#12
stesee · Feb 14, 2022 · 5b9a3e0 · 5b9a3e0
1 parent 72696ca
commit 5b9a3e0
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 53 deletions.
diff --git a/ClosedXML/ClosedXML.csproj b/ClosedXML/ClosedXML.csproj
@@ -16,32 +16,26 @@
 		<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
 		<Description>ClosedXML is a .NET library for reading, manipulating and writing Excel 2007+ (.xlsx, .xlsm) files. It aims to provide an intuitive and user-friendly interface to dealing with the underlying OpenXML API.</Description>
 		<Copyright>MIT</Copyright>
+		<PackageIcon>Product.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/stesee/ClosedXML</PackageProjectUrl>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<Configurations>Debug;Release</Configurations>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
+		<PackageIcon>Product.png</PackageIcon>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<RepositoryUrl>https://github.com/stesee/ClosedXML</RepositoryUrl>
+		<DebugType>embedded</DebugType>
 		<PackageReadmeFile>nugetReadme.md</PackageReadmeFile>
 		<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+		<EnableNETAnalyzers>True</EnableNETAnalyzers>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<None Include="docs\nugetReadme.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-		<DefineConstants>TRACE;_NETSTANDARD_;_NETSTANDARD2_0_</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'net48' ">
-		<DefineConstants>$(DefineConstants);_NETFRAMEWORK_;_NET46_</DefineConstants>
-	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
@@ -56,13 +50,12 @@
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<None Include="..\.editorconfig" Link=".editorconfig" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<PackageReference Include="DocumentFormat.OpenXml" Version="2.15.0" />
 		<PackageReference Include="ExcelNumberFormat" Version="1.1.0" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="Product.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
 </Project>
diff --git a/ClosedXML/ClosedXML.nuspec b/ClosedXML/ClosedXML.nuspec
diff --git a/ClosedXML/Excel/CalcEngine/Functions/Text.cs b/ClosedXML/Excel/CalcEngine/Functions/Text.cs
@@ -231,7 +231,7 @@ private static object Search(List<Expression> p)
             var search = WildcardToRegex(p[0]);
             var text = (string)p[1];
 
-            if ("" == text) throw new ArgumentException("Invalid input string.");
+            if (string.IsNullOrEmpty(text)) throw new ArgumentException("Invalid input string.");
 
             var start = 0;
             if (p.Count > 2)
@@ -259,8 +259,8 @@ private static object Substitute(List<Expression> p)
             var oldText = (string)p[1];
             var newText = (string)p[2];
 
-            if ("" == text) return "";
-            if ("" == oldText) return text;
+            if (string.IsNullOrEmpty(text)) return "";
+            if (string.IsNullOrEmpty(oldText)) return text;
 
             // if index not supplied, replace all
             if (p.Count == 3)

diff --git a/ClosedXML/Excel/Cells/XLCell.cs b/ClosedXML/Excel/Cells/XLCell.cs
@@ -133,7 +133,7 @@ public string InnerText
                 if (HasRichText)
                     return _richText.ToString();
 
-                return string.Empty == _cellValue ? FormulaA1 : _cellValue;
+                return string.IsNullOrEmpty(_cellValue) ? FormulaA1 : _cellValue;
             }
         }
 
@@ -583,7 +583,7 @@ private Object ParseCellValueFromString()
         private Object ParseCellValueFromString(String cellValue, XLDataType dataType, out String error)
         {
             error = "";
-            if ("" == cellValue)
+            if (string.IsNullOrEmpty(cellValue))
                 return "";
 
             if (dataType == XLDataType.Boolean)

diff --git a/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs b/ClosedXML/Excel/PageSetup/XLHeaderFooter.cs
@@ -84,7 +84,7 @@ private static IEnumerable<ParsedHeaderFooterElement> ParseFormattedHeaderFooter
             {
                 if (IsAtPositionIndicator(i))
                 {
-                    if ("" != hfElement) parsedElements.Add(new ParsedHeaderFooterElement()
+                    if (!string.IsNullOrEmpty(hfElement)) parsedElements.Add(new ParsedHeaderFooterElement()
                     {
                         Position = currentPosition,
                         Text = hfElement
@@ -104,7 +104,7 @@ private static IEnumerable<ParsedHeaderFooterElement> ParseFormattedHeaderFooter
                 }
             }
 
-            if ("" != hfElement)
+            if (!string.IsNullOrEmpty(hfElement))
                 parsedElements.Add(new ParsedHeaderFooterElement()
                 {
                     Position = currentPosition,

diff --git a/ClosedXML/Excel/Protection/XLSheetProtection.cs b/ClosedXML/Excel/Protection/XLSheetProtection.cs
@@ -112,7 +112,7 @@ public IXLSheetProtection Unprotect(String password)
             {
                 password = password ?? "";
 
-                if ("" != PasswordHash && "" == password)
+                if (!string.IsNullOrEmpty(PasswordHash) && string.IsNullOrEmpty(password))
                     throw new InvalidOperationException("The worksheet is password protected");
 
                 var hash = Utils.CryptographicAlgorithms.GetPasswordHash(this.Algorithm, password, this.Base64EncodedSalt, this.SpinCount);

diff --git a/ClosedXML/Excel/Protection/XLWorkbookProtection.cs b/ClosedXML/Excel/Protection/XLWorkbookProtection.cs
@@ -116,7 +116,7 @@ public IXLWorkbookProtection Unprotect(String password)
             {
                 password = password ?? "";
 
-                if ("" != PasswordHash && "" == password)
+                if (!string.IsNullOrEmpty(PasswordHash) && string.IsNullOrEmpty(password))
                     throw new InvalidOperationException("The workbook structure is password protected");
 
                 var hash = Utils.CryptographicAlgorithms.GetPasswordHash(this.Algorithm, password, this.Base64EncodedSalt, this.SpinCount);

diff --git a/ClosedXML/Product.png b/ClosedXML/Product.png
diff --git a/ClosedXML/Utils/CryptographicAlgorithms.cs b/ClosedXML/Utils/CryptographicAlgorithms.cs
@@ -37,7 +37,7 @@ public static String GetPasswordHash(Algorithm algorithm, String password, Strin
             if (salt == null)
                 throw new ArgumentNullException(nameof(salt));
 
-            if ("" == password) return "";
+            if (string.IsNullOrEmpty(password)) return "";
 
             switch (algorithm)
             {