Update

codebude · Jun 5, 2024 · ff5e57c · ff5e57c
1 parent b788897
commit ff5e57c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/wf-verify-formatting.yml b/.github/workflows/wf-verify-formatting.yml
@@ -8,6 +8,17 @@ on:
 jobs:
   format:
     runs-on: windows-2019
+    strategy:
+      matrix:
+        folder:
+          - QRCoder
+          - QRCoder.Xaml
+          - QRCoderApiTests
+          - QRCoderBenchmarks
+          - QRCoderConsole
+          - QRCoderDemo
+          - QRCoderTests
+          - QRCoderTrimAnalysis
     env:
       CIFormatting: yes
     steps:
@@ -26,5 +37,6 @@ jobs:
     - name: Restore NuGet Packages
       run: dotnet restore
 
-    - name: Build library
+    - name: Format QRCoder
+      working-directory: ${{ matrix.folder }}
       run: dotnet format --verify-no-changes --verbosity detailed
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,5 +3,6 @@
     <LangVersion>10</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsNotAsErrors>$(WarningsNotAsErrors);IDE0005</WarningsNotAsErrors>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/QRCoder.Xaml/QRCoder.Xaml.csproj b/QRCoder.Xaml/QRCoder.Xaml.csproj
@@ -7,7 +7,6 @@
     <UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWPF>
     <DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
     <DefineConstants Condition="'$(TargetFramework)' == 'net6.0-windows'">$(DefineConstants);NET6_0_WINDOWS</DefineConstants>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
 

diff --git a/QRCoder.sln b/QRCoder.sln
@@ -56,6 +56,7 @@ Global
 		{AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|x86.ActiveCfg = Release|Any CPU
 		{AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|x86.Build.0 = Release|Any CPU
 		{014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|ARM.Build.0 = Debug|Any CPU
 		{014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -70,6 +71,7 @@ Global
 		{014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|x86.ActiveCfg = Release|Any CPU
 		{014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|x86.Build.0 = Release|Any CPU
 		{CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|ARM.ActiveCfg = Debug|x86
 		{CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|x64.ActiveCfg = Debug|x86
 		{CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|x86.ActiveCfg = Debug|Any CPU

diff --git a/QRCoder/QRCoder.csproj b/QRCoder/QRCoder.csproj
@@ -7,7 +7,6 @@
     <DefineConstants Condition="'$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'netstandard1.3'">$(DefineConstants);SYSTEM_DRAWING</DefineConstants>
     <DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
     <DefineConstants Condition="'$(TargetFramework)' == 'net6.0-windows'">$(DefineConstants);NET6_0_WINDOWS</DefineConstants>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
     <WarningsAsErrors>$(WarningsAsErrors);CS1591</WarningsAsErrors>

diff --git a/QRCoderTests/QRCoderTests.csproj b/QRCoderTests/QRCoderTests.csproj
@@ -10,7 +10,6 @@
     <DefineConstants Condition="'$(TargetFramework)' == 'net6.0-windows'">$(DefineConstants);NET6_0_WINDOWS</DefineConstants>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <NoWarn>$(NoWarn);NU1903</NoWarn>
   </PropertyGroup>