From fcd36966ea4eda85c381c0a82001cbd4daf302ec Mon Sep 17 00:00:00 2001
From: Amadeusz Sadowski <amadeusz.sadowski@allegro.com>
Date: Tue, 9 Apr 2024 15:48:11 +0200
Subject: [PATCH 1/4] fix: correct Condition for stylecop.json inclusion

Condition for `stylecop.json` inclusion in `Allegro.NET.Sdk.CSharp.targets` had an extra `)` at the end after previous PR removed part of condition, which resulted in MSBuild parsing errors.
---
 src/Allegro.DotnetSdk/Sdk/Allegro.NET.Sdk.CSharp.targets | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Allegro.DotnetSdk/Sdk/Allegro.NET.Sdk.CSharp.targets b/src/Allegro.DotnetSdk/Sdk/Allegro.NET.Sdk.CSharp.targets
index 2f5a561..f78ef20 100644
--- a/src/Allegro.DotnetSdk/Sdk/Allegro.NET.Sdk.CSharp.targets
+++ b/src/Allegro.DotnetSdk/Sdk/Allegro.NET.Sdk.CSharp.targets
@@ -7,10 +7,9 @@
   </PropertyGroup>
 
   <!-- 
-    Include stylecop configuration if we include StyleCop analyzer within this Sdk,
-    or if it was included externally as GlobalPackageReference when CPM is enabled.
+    Include stylecop configuration if StyleCop was included externally as GlobalPackageReference when CPM is enabled.
   -->
-  <ItemGroup Condition="'$(AllegroDotnetSdkEnableStyleCopConfig)' == 'true' Or @(GlobalPackageReference->WithMetadataValue('Identity','StyleCop.Analyzers')->Count()) > 0)">
+  <ItemGroup Condition="'$(AllegroDotnetSdkEnableStyleCopConfig)' == 'true' And @(GlobalPackageReference->WithMetadataValue('Identity','StyleCop.Analyzers')->Count()) > 0">
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
   </ItemGroup>
 
@@ -23,4 +22,4 @@
     <Using Remove="System.Net.Http" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>

From 9e00226d77ca34b7c18e0cc3502ab89a52c3f168 Mon Sep 17 00:00:00 2001
From: Pawel Piwowarczyk <pawel.piwowarczyk@allegro.com>
Date: Wed, 10 Apr 2024 08:55:39 +0200
Subject: [PATCH 2/4] fix: working directory to run tests and use sln

---
 .github/workflows/template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/template.yml b/.github/workflows/template.yml
index d86148c..503911c 100644
--- a/.github/workflows/template.yml
+++ b/.github/workflows/template.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: src/${{ inputs.projectName }}
+        working-directory: ./
     outputs:
       nupkgFilename: ${{ steps.nupkg.outputs.filename }}
     steps:
@@ -64,7 +64,7 @@ jobs:
         if: inputs.publish
         with:
           name: package
-          path: src/${{ inputs.projectName }}/package
+          path: package
   publish:
     runs-on: windows-latest
     if: inputs.publish

From f8b4c84d45f3d71765f976ab0c7a2fac96fb8f26 Mon Sep 17 00:00:00 2001
From: Amadeusz Sadowski <amadeusz.sadowski@allegro.com>
Date: Wed, 10 Apr 2024 14:28:00 +0200
Subject: [PATCH 3/4] chore: bump to v2.2.2

---
 README.md                                      | 4 ++--
 src/Allegro.DotnetSdk/Allegro.DotnetSdk.csproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9058a50..1da186e 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ It's necessary to include `Allegro.DotnetSdk` with the desired version in `globa
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {
-    "Allegro.DotnetSdk": "2.1.0"
+    "Allegro.DotnetSdk": "2.2.2"
   }
 }
 
@@ -97,7 +97,7 @@ Configure in `*.csproj` - project settings:
 This SDK provides some default configuration (rules severity) for selected analyzers: StyleCop, Meziantou and AsyncFixer. It doesn't actually reference them. Avoiding direct references ensures that developers can seamlessly apply and update analyzers without being tied to specific versions.
 
 To add analyzers, include the following in your `Directory.Build.props` or `Directory.Packages.props` file:
-	
+
 ```xml
 <Project>
     <!-- ... -->
diff --git a/src/Allegro.DotnetSdk/Allegro.DotnetSdk.csproj b/src/Allegro.DotnetSdk/Allegro.DotnetSdk.csproj
index fe76be9..0e2d0a5 100644
--- a/src/Allegro.DotnetSdk/Allegro.DotnetSdk.csproj
+++ b/src/Allegro.DotnetSdk/Allegro.DotnetSdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <PackageVersion>2.2.1</PackageVersion>
+    <PackageVersion>2.2.2</PackageVersion>
     <IsPackable>true</IsPackable>
     <DevelopmentDependency>true</DevelopmentDependency>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

From e09e1ad7d3d37ec3b7771a831c5bb3164fe1997a Mon Sep 17 00:00:00 2001
From: Amadeusz Sadowski <amadeusz.sadowski@allegro.com>
Date: Wed, 10 Apr 2024 14:16:20 +0200
Subject: [PATCH 4/4] test: allow rollForward for Net8SdkValid test

---
 src/Allegro.DotnetSdk.Tests/projects/Net8SdkValid/global.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Allegro.DotnetSdk.Tests/projects/Net8SdkValid/global.json b/src/Allegro.DotnetSdk.Tests/projects/Net8SdkValid/global.json
index f3365c4..501e79a 100644
--- a/src/Allegro.DotnetSdk.Tests/projects/Net8SdkValid/global.json
+++ b/src/Allegro.DotnetSdk.Tests/projects/Net8SdkValid/global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100"
+    "version": "8.0.100",
+    "rollForward": "latestFeature"
   }
 }
\ No newline at end of file