From e89d403c221297fc36ecf76e24758a77de782ee3 Mon Sep 17 00:00:00 2001
From: Adam Reynolds <adamajreynolds@gmail.com>
Date: Thu, 10 Oct 2024 20:31:25 +0000
Subject: [PATCH 1/5] Added nuspec for analyzer reports

---
 src/Analyzer.Reports/Analyzer.Reports.nuspec | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/Analyzer.Reports/Analyzer.Reports.nuspec

diff --git a/src/Analyzer.Reports/Analyzer.Reports.nuspec b/src/Analyzer.Reports/Analyzer.Reports.nuspec
new file mode 100644
index 00000000..70fa941f
--- /dev/null
+++ b/src/Analyzer.Reports/Analyzer.Reports.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>Azure.Templates.Analyzer.Reports</id>
+        <version>$version$</version>
+        <authors>Microsoft</authors>
+        <description>Template analyzer output report generator supporting SARIF and console.</description>
+        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+        <license type="expression">MIT</license>
+        <projectUrl>https://github.com/Azure/template-analyzer</projectUrl>
+        <tags>arm bicep azure template analyzer scanner deployment security sarif report</tags>
+
+        <dependencies>
+            <group targetFramework="net8.0">
+                <dependency id="Newtonsoft.json" version="13.0.3" />
+                <dependency id="Sarif.Sdk" version="2.4.12" />
+                <dependency id="System.IO.Abstractions" version="19.1.5" />
+                <dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.1" />
+            </group>
+        </dependencies>
+    </metadata>
+</package>
\ No newline at end of file

From 13f2c90a76376583801e4572386eae56baa2f68b Mon Sep 17 00:00:00 2001
From: Adam Reynolds <adamajreynolds@gmail.com>
Date: Thu, 10 Oct 2024 20:38:04 +0000
Subject: [PATCH 2/5] Try to fix missing nuget CLI dependencies

---
 .github/workflows/dotnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 35ac99a4..11f4d64e 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -38,7 +38,7 @@ jobs:
         dotnet-version: 8.x
     
     - name: Setup NuGet
-      uses: nuget/setup-nuget@v1
+      uses: nuget/setup-nuget@v2
         
     - name: Restore dependencies
       run: dotnet restore

From bd1b8154b18f3b918304a4d955f6cabdebda9f75 Mon Sep 17 00:00:00 2001
From: Adam Reynolds <adamajreynolds@gmail.com>
Date: Thu, 10 Oct 2024 20:43:00 +0000
Subject: [PATCH 3/5] Updated dotnet.yml

---
 .github/workflows/dotnet.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 11f4d64e..18bc7f6d 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -67,6 +67,9 @@ jobs:
     - name: Pack Analyzer.TemplateProcessing
       run: nuget pack Analyzer.TemplateProcessing.NuGet/Analyzer.TemplateProcessing.nuspec -Version ${{ steps.get-version.outputs.result }} -Properties configuration=${{ env.Configuration }}
       
+    - name: pack Analyzer.Reports
+      run: nuget pack Analyzer.Reports/Analyzer.Reports.nuspec -Version ${{ steps.get-version.outputs.result }} -Properties configuration=${{ env.Configuration }}
+
     - name: (dotnet) Publish CLI
       run: dotnet publish Analyzer.Cli/Analyzer.Cli.csproj --configuration ${{ env.Configuration }} --runtime ${{ matrix.runtimeId }} --self-contained /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true /p:DebugType=None /p:DebugSymbols=false 
       

From a18a942d3d11ce7ec57fa86d54ec6877ace324f4 Mon Sep 17 00:00:00 2001
From: Adam Reynolds <adreynol@microsoft.com>
Date: Thu, 10 Oct 2024 17:04:39 -0700
Subject: [PATCH 4/5] Fixed nuspec

---
 .../Analyzer.Reports.nuspec                                   | 4 ++++
 1 file changed, 4 insertions(+)
 rename src/{Analyzer.Reports => Analyzer.Reports.NuGet}/Analyzer.Reports.nuspec (90%)

diff --git a/src/Analyzer.Reports/Analyzer.Reports.nuspec b/src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec
similarity index 90%
rename from src/Analyzer.Reports/Analyzer.Reports.nuspec
rename to src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec
index 70fa941f..4c2dad80 100644
--- a/src/Analyzer.Reports/Analyzer.Reports.nuspec
+++ b/src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec
@@ -19,4 +19,8 @@
             </group>
         </dependencies>
     </metadata>
+
+    <files>
+        <file src="..\Analyzer.Reports\bin\$configuration$\net8.0\*.dll" target="lib\net8.0" />
+    </files>
 </package>
\ No newline at end of file

From 67dcf6b35514b372a7cbd00ce720d3099dabc495 Mon Sep 17 00:00:00 2001
From: Adam Reynolds <adreynol@microsoft.com>
Date: Thu, 10 Oct 2024 17:13:37 -0700
Subject: [PATCH 5/5] Derp

---
 .github/workflows/dotnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 18bc7f6d..458381bc 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -68,7 +68,7 @@ jobs:
       run: nuget pack Analyzer.TemplateProcessing.NuGet/Analyzer.TemplateProcessing.nuspec -Version ${{ steps.get-version.outputs.result }} -Properties configuration=${{ env.Configuration }}
       
     - name: pack Analyzer.Reports
-      run: nuget pack Analyzer.Reports/Analyzer.Reports.nuspec -Version ${{ steps.get-version.outputs.result }} -Properties configuration=${{ env.Configuration }}
+      run: nuget pack Analyzer.Reports.NuGet/Analyzer.Reports.nuspec -Version ${{ steps.get-version.outputs.result }} -Properties configuration=${{ env.Configuration }}
 
     - name: (dotnet) Publish CLI
       run: dotnet publish Analyzer.Cli/Analyzer.Cli.csproj --configuration ${{ env.Configuration }} --runtime ${{ matrix.runtimeId }} --self-contained /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true /p:DebugType=None /p:DebugSymbols=false