Updated configuration.

mahara · Nov 11, 2024 · d2801d7 · d2801d7
1 parent b64e6f6
commit d2801d7
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,9 @@ log/
 
 *.suo
 *.user
-*.dbmdl
-*.dbconfig
 *.log
+*.binlog
 *.cache
+*.dbmdl
+*.dbconfig
 Thumbs.db
diff --git a/.globalconfig b/.globalconfig
@@ -0,0 +1,10 @@
+# Global AnalyzerConfig
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/configuration-files
+# https://github.com/dotnet/roslyn/issues/47707
+is_global = true
+
+
+# Microsoft.CodeAnalysis.CSharp.Analyzers
+
+# https://github.com/dotnet/roslyn-analyzers/issues/6676
+#dotnet_diagnostic.RS1022.severity = none
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -14,15 +14,15 @@
     <PackageVersion Include="Iesi.Collections" Version="4.1.1" />
     <PackageVersion Include="IndexRange" Version="1.0.3" />
     <PackageVersion Include="LiquidTestReports.Markdown" Version="1.0.9" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
     <PackageVersion Include="NHibernate" Version="[5.5.2,6.0)" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
-    <PackageVersion Include="NUnit" Version="4.1.0" />
+    <PackageVersion Include="NUnit" Version="4.2.2" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="NUnitLite" Version="4.1.0" />
-    <PackageVersion Include="NunitXml.TestLogger" Version="4.0.254" />
+    <PackageVersion Include="NUnitLite" Version="4.2.2" />
+    <PackageVersion Include="NunitXml.TestLogger" Version="4.1.0" />
     <PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>

diff --git a/NHibernate.ObservableCollections-All.sln b/NHibernate.ObservableCollections-All.sln
@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		.globalconfig = .globalconfig
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE = LICENSE
 		README.md = README.md

diff --git a/NHibernate.ObservableCollections.sln b/NHibernate.ObservableCollections.sln
@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		.globalconfig = .globalconfig
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE = LICENSE
 		README.md = README.md

diff --git a/Project.Build.Properties.props b/Project.Build.Properties.props
@@ -4,6 +4,28 @@
     PROPERTIES
   -->
 
+  <PropertyGroup>
+    <WinExeTargetFrameworks>net8.0-windows</WinExeTargetFrameworks>
+    <WinLibTargetFrameworks>net8.0-windows;net48</WinLibTargetFrameworks>
+    <ExeTargetFrameworks>net8.0</ExeTargetFrameworks>
+    <LibTargetFrameworks>net8.0;net7.0;net6.0;net48</LibTargetFrameworks>
+    <ExeTestTargetFrameworks>net8.0;net7.0;net6.0;net48</ExeTestTargetFrameworks>
+
+    <LangVersion>latest</LangVersion>
+
+    <!--
+      CA2252: Opt in to preview features before using them
+      https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca2252
+    -->
+    <EnablePreviewFeatures>false</EnablePreviewFeatures>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ReportAnalyzer>false</ReportAnalyzer>
+
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+
   <PropertyGroup>
     <AssemblyOriginatorKeyFileName>NHibernate.ObservableCollections.snk</AssemblyOriginatorKeyFileName>
 

diff --git a/build/Project.Build.props b/build/Project.Build.props
@@ -14,23 +14,33 @@
   -->
 
   <PropertyGroup>
-    <WinExeTargetFrameworks>net8.0-windows</WinExeTargetFrameworks>
-    <WinLibTargetFrameworks>net8.0-windows;net48</WinLibTargetFrameworks>
-    <ExeTargetFrameworks>net8.0</ExeTargetFrameworks>
-    <LibTargetFrameworks>net8.0;net7.0;net6.0;net48</LibTargetFrameworks>
-    <ExeTestTargetFrameworks>net8.0;net7.0;net6.0;net48</ExeTestTargetFrameworks>
-
-    <LangVersion>latest</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <WinExeTargetFrameworks Condition="'$(WinExeTargetFrameworks)' == ''">net9.0-windows</WinExeTargetFrameworks>
+    <WinLibTargetFrameworks Condition="'$(WinLibTargetFrameworks)' == ''">net9.0-windows;net48</WinLibTargetFrameworks>
+    <ExeTargetFrameworks Condition="'$(ExeTargetFrameworks)' == ''">net9.0</ExeTargetFrameworks>
+    <LibTargetFrameworks Condition="'$(LibTargetFrameworks)' == ''">net9.0;net8.0;net48</LibTargetFrameworks>
+    <ExeTestTargetFrameworks Condition="'$(ExeTestTargetFrameworks)' == ''">net9.0;net8.0;net48</ExeTestTargetFrameworks>
+
+    <LangVersion Condition="'$(LangVersion)' == ''">latest</LangVersion>
+    <ImplicitUsings Condition="'$(ImplicitUsings)' == ''">enable</ImplicitUsings>
+    <Nullable Condition="'$(Nullable)' == ''">enable</Nullable>
+
+    <!--
+      CA2252: Opt in to preview features before using them
+      https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca2252
+    -->
+    <EnablePreviewFeatures Condition="'$(EnablePreviewFeatures)' == ''">false</EnablePreviewFeatures>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <ReportAnalyzer Condition="'$(ReportAnalyzer)' == ''">false</ReportAnalyzer>
+
+    <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == ''">false</TreatWarningsAsErrors>
     <WarningsAsErrors>$(WarningsAsErrors)</WarningsAsErrors>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <!--<NoWarn>$(NoWarn);CS0612;CS0618</NoWarn>-->
+  </PropertyGroup>
 
+  <PropertyGroup>
     <BuildVersion>0.0.0</BuildVersion>
     <BuildVersion Condition="'$(APPVEYOR_BUILD_VERSION)' != ''">$(APPVEYOR_BUILD_VERSION)</BuildVersion>
     <BuildVersionMajor>$(BuildVersion.Split('.')[0])</BuildVersionMajor>