Merge branch 'main' into FixLockIssue

OrchardCMS · Dec 1, 2023 · 30d75f7 · 30d75f7
2 parents bcf286b + 33f460f
commit 30d75f7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,5 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "omnisharp.projectLoadTimeout": 600
+    "omnisharp.projectLoadTimeout": 600,
+    "FSharp.suggestGitignore": false
 }
diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props
@@ -8,7 +8,7 @@
     <VersionSuffix>preview</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>612,618</WarningsNotAsErrors>
+    <WarningsNotAsErrors>612,618,ASP0019,ASP0023</WarningsNotAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <DebugType>portable</DebugType>

diff --git a/...hardCore.Modules/OrchardCore.DataProtection.Azure/OrchardCore.DataProtection.Azure.csproj b/...hardCore.Modules/OrchardCore.DataProtection.Azure/OrchardCore.DataProtection.Azure.csproj
@@ -14,7 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.3"/>
+    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCore.Data.YesSql.csproj b/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCore.Data.YesSql.csproj
@@ -23,6 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.Drawing.Common" Version="5.0.3" />
     <PackageReference Include="YesSql" />
   </ItemGroup>
 

diff --git a/test/OrchardCore.Tests/OrchardCore.Tests.csproj b/test/OrchardCore.Tests/OrchardCore.Tests.csproj
@@ -5,6 +5,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsNotAsErrors>ASP0019,ASP0023</WarningsNotAsErrors>
   </PropertyGroup>
 
   <ItemGroup>