From 0bfe37de8bf894547c58a86f6d61c87b4ff51a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Szab=C3=B3?= <szabo.gabor@podnet.hu>
Date: Wed, 11 Sep 2024 00:32:05 +0200
Subject: [PATCH] Updated CI, added global.json, bumped dependencies to fix
 packaging issue

---
 .github/workflows/cd-nuget.yml                      | 13 +------------
 PodNet.EmbeddedTexts.sln                            |  1 +
 global.json                                         |  6 ++++++
 src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj       | 10 ++++------
 .../EmbeddedTextGeneratorTests.cs                   |  2 --
 5 files changed, 12 insertions(+), 20 deletions(-)
 create mode 100644 global.json

diff --git a/.github/workflows/cd-nuget.yml b/.github/workflows/cd-nuget.yml
index 38ef4c8..a6d225d 100644
--- a/.github/workflows/cd-nuget.yml
+++ b/.github/workflows/cd-nuget.yml
@@ -1,13 +1,2 @@
 on: { push: { tags: ["v[0-9]+.[0-9]+.[0-9]+*"] } }
-    
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3
-      - run: |
-          dotnet pack ./src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj -c debug
-          dotnet test
-      - run: dotnet pack -p:Version=$(echo ${{ github.ref_name }} | sed 's/^v//') -p:RepositoryCommit=${{ github.sha }}
-      - run: dotnet nuget push ./artifacts/package/release/*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
+jobs: { publish: { uses: podNET-Hungary/pod-nugetizer/.github/workflows/default.yml@v1, secrets: inherit }}
\ No newline at end of file
diff --git a/PodNet.EmbeddedTexts.sln b/PodNet.EmbeddedTexts.sln
index 91dd921..066267e 100644
--- a/PodNet.EmbeddedTexts.sln
+++ b/PodNet.EmbeddedTexts.sln
@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{3ED2BD42
 		.gitignore = .gitignore
 		.github\workflows\cd-nuget.yml = .github\workflows\cd-nuget.yml
 		Directory.Build.props = Directory.Build.props
+		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..34f3aed
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.401",
+    "rollForward": "latestMajor"
+  }
+}
diff --git a/src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj b/src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj
index 0ee2ffb..0e71fef 100644
--- a/src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj
+++ b/src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj
@@ -2,16 +2,14 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<PackageId>PodNet.EmbeddedTexts</PackageId>
 		<Description>A simple C# code generator that allows for embedding text file content into your code.</Description>
 		<PackageTags>EmbeddedTexts, PodNet, generator, embedded, texts, resx, resource, awesome</PackageTags>
 	</PropertyGroup>
-
 	<ItemGroup>
-		<PackageReference Include="PodNet.Analyzers.Core" Version="1.0.15" PrivateAssets="all" />
-		<PackageReference Include="PodNet.NuGet.Core" Version="1.1.0" PrivateAssets="all" />
-
+		<PackageReference Include="PodNet.Analyzers.Core" Version="1.0.17" PrivateAssets="all" />
+		<PackageReference Include="PodNet.NuGet.Core" Version="1.2.2" PrivateAssets="all" />
+		
 		<Content Include="build/*" PackagePath="build" />
 	</ItemGroup>
-	
+
 </Project>
\ No newline at end of file
diff --git a/tests/EmbeddedTexts.Tests/EmbeddedTextGeneratorTests.cs b/tests/EmbeddedTexts.Tests/EmbeddedTextGeneratorTests.cs
index 8db4b67..24d8ebb 100644
--- a/tests/EmbeddedTexts.Tests/EmbeddedTextGeneratorTests.cs
+++ b/tests/EmbeddedTexts.Tests/EmbeddedTextGeneratorTests.cs
@@ -1,10 +1,8 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PodNet.Analyzers.Testing.CSharp;
 using PodNet.Analyzers.Testing.Diffing;
-using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Reflection;
 using Fakes = PodNet.Analyzers.Testing.CodeAnalysis.Fakes;