From 2915d9514060f26701e10d624de38dc1992058d1 Mon Sep 17 00:00:00 2001
From: Aydin Erdas <info@aydinerdas.com>
Date: Tue, 11 Jun 2024 19:03:18 +0200
Subject: [PATCH 1/4] Update nuspec templates

---
 Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj            | 2 --
 Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template   | 2 +-
 Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj      | 2 --
 .../Lombiq.Analyzers.Orchard1.nuspec.template                   | 2 +-
 .../Lombiq.Analyzers.OrchardCore.csproj                         | 2 --
 .../Lombiq.Analyzers.OrchardCore.nuspec.template                | 2 +-
 .../Lombiq.Analyzers.VisualStudioExtension.csproj               | 2 --
 .../Lombiq.Analyzers.VisualStudioExtension.nuspec.template      | 2 +-
 Lombiq.Analyzers/Lombiq.Analyzers.csproj                        | 2 --
 Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template               | 2 +-
 10 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj
index 47bf2f80..fafabd47 100644
--- a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj
+++ b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <!-- This is duplicated with Lombiq.Analyzers.NetFx.nuspec.template but is needed for the NuGet publishing workflow
-    not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
diff --git a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template
index 52a9c515..c2885c45 100644
--- a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template
+++ b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template
@@ -5,7 +5,7 @@
         <version>$version$</version>
         <title>Lombiq .NET Analyzers for .NET Framework</title>
         <authors>Lombiq Technologies</authors>
-        <license type="file">License.md</license>
+        <license type="expression">BSD-3-Clause</license>
         <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.NetFx</projectUrl>
diff --git a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj
index 24c65b2f..b57cc497 100644
--- a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj
+++ b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <!-- This is duplicated with Lombiq.Analyzers.Orchard1.nuspec.template but is needed for the NuGet publishing
-    workflow not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
diff --git a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template
index 165da160..814d301f 100644
--- a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template
+++ b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template
@@ -5,7 +5,7 @@
         <version>$version$</version>
         <title>Lombiq .NET Analyzers for Orchard 1</title>
         <authors>Lombiq Technologies</authors>
-        <license type="file">License.md</license>
+        <license type="expression">BSD-3-Clause</license>
         <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.Orchard1</projectUrl>
diff --git a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj
index 60f684e7..0d73b65f 100644
--- a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj
+++ b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <!-- This is duplicated with Lombiq.Analyzers.OrchardCore.nuspec.template but is needed for the NuGet publishing
-    workflow not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
diff --git a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template
index 0a679ed1..05226ba8 100644
--- a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template
+++ b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template
@@ -5,7 +5,7 @@
         <version>$version$</version>
         <title>Lombiq .NET Analyzers for Orchard Core</title>
         <authors>Lombiq Technologies</authors>
-        <license type="file">License.md</license>
+        <license type="expression">BSD-3-Clause</license>
         <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.OrchardCore</projectUrl>
diff --git a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj
index 93702908..8df98bbf 100644
--- a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj
+++ b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <!-- This is duplicated with Lombiq.Analyzers.VisualStudioExtension.nuspec.template but is needed for the NuGet
-    publishing workflow not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
diff --git a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template
index d9809c33..1f116c6e 100644
--- a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template
+++ b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template
@@ -5,7 +5,7 @@
         <version>$version$</version>
         <title>Lombiq .NET Analyzers for Visual Studio Extensions</title>
         <authors>Lombiq Technologies</authors>
-        <license type="file">License.md</license>
+        <license type="expression">BSD-3-Clause</license>
         <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.VisualStudioExtension</projectUrl>
diff --git a/Lombiq.Analyzers/Lombiq.Analyzers.csproj b/Lombiq.Analyzers/Lombiq.Analyzers.csproj
index 9e68170e..e9b5a426 100644
--- a/Lombiq.Analyzers/Lombiq.Analyzers.csproj
+++ b/Lombiq.Analyzers/Lombiq.Analyzers.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <!-- This is duplicated with Lombiq.Analyzers.nuspec.template but is needed for the NuGet publishing workflow not to
-    throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
diff --git a/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template b/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template
index 813da85e..25e413b7 100644
--- a/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template
+++ b/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template
@@ -5,7 +5,7 @@
         <version>$version$</version>
         <title>Lombiq .NET Analyzers</title>
         <authors>Lombiq Technologies</authors>
-        <license type="file">License.md</license>
+        <license type="expression">BSD-3-Clause</license>
         <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers</projectUrl>

From 670d2e93e2b979ea8cb63f6dee013b7112a61a7f Mon Sep 17 00:00:00 2001
From: Aydin Erdas <info@aydinerdas.com>
Date: Tue, 11 Jun 2024 19:09:04 +0200
Subject: [PATCH 2/4] Remove license url

---
 Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template    | 1 -
 .../Lombiq.Analyzers.Orchard1.nuspec.template                    | 1 -
 .../Lombiq.Analyzers.OrchardCore.nuspec.template                 | 1 -
 .../Lombiq.Analyzers.VisualStudioExtension.nuspec.template       | 1 -
 Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template                | 1 -
 5 files changed, 5 deletions(-)

diff --git a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template
index c2885c45..bc2d34bc 100644
--- a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template
+++ b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.nuspec.template
@@ -6,7 +6,6 @@
         <title>Lombiq .NET Analyzers for .NET Framework</title>
         <authors>Lombiq Technologies</authors>
         <license type="expression">BSD-3-Clause</license>
-        <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.NetFx</projectUrl>
         <description>Lombiq .NET Analyzers for .NET Framework: .NET code analyzers and code convention settings for .NET Framework projects. See the project website for detailed documentation.</description>
diff --git a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template
index 814d301f..cd4bfb53 100644
--- a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template
+++ b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.nuspec.template
@@ -6,7 +6,6 @@
         <title>Lombiq .NET Analyzers for Orchard 1</title>
         <authors>Lombiq Technologies</authors>
         <license type="expression">BSD-3-Clause</license>
-        <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.Orchard1</projectUrl>
         <description>Lombiq .NET Analyzers for Orchard 1: .NET code analyzers and code convention settings for Orchard 1 (https://orchardcore.net/orchardcms) apps. See the project website for detailed documentation.</description>
diff --git a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template
index 05226ba8..f96e8643 100644
--- a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template
+++ b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.nuspec.template
@@ -6,7 +6,6 @@
         <title>Lombiq .NET Analyzers for Orchard Core</title>
         <authors>Lombiq Technologies</authors>
         <license type="expression">BSD-3-Clause</license>
-        <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.OrchardCore</projectUrl>
         <description>Lombiq .NET Analyzers for Orchard Core: .NET code analyzers and code convention settings for Orchard Core (https://orchardcore.net/) apps. See the project website for detailed documentation.</description>
diff --git a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template
index 1f116c6e..a26259b6 100644
--- a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template
+++ b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.nuspec.template
@@ -6,7 +6,6 @@
         <title>Lombiq .NET Analyzers for Visual Studio Extensions</title>
         <authors>Lombiq Technologies</authors>
         <license type="expression">BSD-3-Clause</license>
-        <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers.VisualStudioExtension</projectUrl>
         <description>Lombiq .NET Analyzers for Visual Studio Extensions: .NET code analyzers and code convention settings for Visual Studio Extensions. See the project website for detailed documentation.</description>
diff --git a/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template b/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template
index 25e413b7..4518e627 100644
--- a/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template
+++ b/Lombiq.Analyzers/Lombiq.Analyzers.nuspec.template
@@ -6,7 +6,6 @@
         <title>Lombiq .NET Analyzers</title>
         <authors>Lombiq Technologies</authors>
         <license type="expression">BSD-3-Clause</license>
-        <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
         <icon>NuGetIcon.png</icon>
         <projectUrl>https://github.com/Lombiq/.NET-Analyzers/blob/dev/Lombiq.Analyzers</projectUrl>
         <description>Lombiq .NET Analyzers: .NET code analyzers and code convention settings for general .NET projects. See the project website for detailed documentation.</description>

From c82500e63fcfa351bdfe231b7ca7222eca3264b6 Mon Sep 17 00:00:00 2001
From: Aydin Erdas <info@aydinerdas.com>
Date: Tue, 11 Jun 2024 19:28:29 +0200
Subject: [PATCH 3/4] Remove license expression from csproj

---
 Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj
index fafabd47..41795350 100644
--- a/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj
+++ b/Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.

From 095b350751f4b78f4451ec0c15167e64f48df320 Mon Sep 17 00:00:00 2001
From: Aydin Erdas <info@aydinerdas.com>
Date: Tue, 11 Jun 2024 19:34:12 +0200
Subject: [PATCH 4/4] remove duplicate license expressions

---
 Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj       | 1 -
 Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj | 1 -
 .../Lombiq.Analyzers.VisualStudioExtension.csproj                | 1 -
 Lombiq.Analyzers/Lombiq.Analyzers.csproj                         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj
index b57cc497..0bf31a7d 100644
--- a/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj
+++ b/Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
diff --git a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj
index 0d73b65f..950a7bf4 100644
--- a/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj
+++ b/Lombiq.Analyzers.OrchardCore/Lombiq.Analyzers.OrchardCore.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
diff --git a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj
index 8df98bbf..6f0092ee 100644
--- a/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj
+++ b/Lombiq.Analyzers.VisualStudioExtension/Lombiq.Analyzers.VisualStudioExtension.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
diff --git a/Lombiq.Analyzers/Lombiq.Analyzers.csproj b/Lombiq.Analyzers/Lombiq.Analyzers.csproj
index e9b5a426..d0697374 100644
--- a/Lombiq.Analyzers/Lombiq.Analyzers.csproj
+++ b/Lombiq.Analyzers/Lombiq.Analyzers.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.