Merge pull request #54 from OrchardCMS/zl/update-2.1.6

Update for 2.1.6

Author: Piedone

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+  
+on: 
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+
+jobs:
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, windows-2022]
+
+    steps:
+    - uses: actions/checkout@v4
+  
+    - uses: OrchardCMS/OrchardCore/.github/actions/setup-dotnet@main
+  
+    - name: Build
+      # We disable NuGet audit warnings, see https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904.
+      # Security issues being discovered in NuGet packages we use can happen at any time, and thus all our CI builds that
+      # treat warnings as errors could break anytime, without us changing the code. This prevents that. Treating them as
+      # warnings and other better approaches don't work, see https://github.com/OrchardCMS/OrchardCore/pull/16317.
+      run: |
+        dotnet build -c Release /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true /p:NuGetAudit=false

Directory.Build.props

@@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <OrchardCoreVersion>2.1.6</OrchardCoreVersion>
+  </PropertyGroup>
+
+</Project>

NuGet.config

@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<packageSources>
-		<clear />
-		<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-		<!-- 
-        This feed is intended for development purposes only and should not be used when publishing to NuGet. 
-        It is meant to be utilized exclusively in the dev branch while certain dependencies are unavailable on NuGet.org.
-        
-        As multiple sources are being used, be sure to uncomment the 'packageSourceMapping' section below.
-        -->
-		<!-- add key="OrchardCore" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" /-->
-	</packageSources>
+  <packageSources>
+    <clear />
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+    <add key="OrchardCore" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
+  </packageSources>
 
-	<!--
-		<packageSourceMapping>
-			<packageSource key="OrchardCore">
-				<package pattern="OrchardCore*" />
-				<package pattern="SafeMode" />
-			</packageSource>
-			<packageSource key="NuGet">
-				<package pattern="*" />
-			</packageSource>
-		</packageSourceMapping>
-	-->
-
-	<disabledPackageSources />
+  <disabledPackageSources />
 </configuration>

OrchardCore.Samples.sln

@@ -22,6 +22,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardApplication", "DashboardApplication\DashboardApplication.csproj", "{1E751DAB-8A21-48EB-96E4-F0ED9C999462}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{8BC87CB0-F8FD-427D-8F6D-CC95D6EA23FA}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci.yml = .github\workflows\ci.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -52,6 +59,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{8BC87CB0-F8FD-427D-8F6D-CC95D6EA23FA} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0AD5090C-3961-4E2B-9C72-D91ED2E7C1FA}
 	EndGlobalSection