Skip to content

Commit ad65a9b

Browse files
committed
Merge branch 'main' into hishamco/1.3.1
2 parents 7d898e0 + 4b91d8a commit ad65a9b

7 files changed

Lines changed: 44 additions & 131 deletions

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
name: Build windows-latest
1414
runs-on: windows-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v6
1717
- name: Setup .NET Core
18-
uses: actions/setup-dotnet@v1
18+
uses: actions/setup-dotnet@v5
1919
with:
20-
dotnet-version: 8.0.*
20+
dotnet-version: 10.0.*
2121
- name: Install Dependencies
2222
run: dotnet restore
2323
- name: Build

.github/workflows/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "nuget"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"

Directory.Build.props

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
4+
<LangVersion>latest</LangVersion>
45
<ImplicitUsings>enable</ImplicitUsings>
56
<Nullable>disable</Nullable>
6-
<IsPackable>false</IsPackable>
7+
<!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
8+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
79
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
10+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
11+
<NoWarn>NU1507</NoWarn>
812
</PropertyGroup>
913
</Project>

Directory.Packages.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
</PropertyGroup>
52
<ItemGroup>
63
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
74
<PackageVersion Include="Fluid.Core" Version="2.31.0" />

OrchardCoreContrib.PoExtractor.sln

Lines changed: 0 additions & 117 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path="Directory.Build.props" />
4+
<File Path="Directory.Packages.props" />
5+
<File Path="NuGet.config" />
6+
<File Path="README.md" />
7+
</Folder>
8+
<Folder Name="/src/">
9+
<Project Path="src/OrchardCoreContrib.PoExtractor.Abstractions/OrchardCoreContrib.PoExtractor.Abstractions.csproj" />
10+
<Project Path="src/OrchardCoreContrib.PoExtractor.DotNet.CS/OrchardCoreContrib.PoExtractor.DotNet.CS.csproj" />
11+
<Project Path="src/OrchardCoreContrib.PoExtractor.DotNet.VB/OrchardCoreContrib.PoExtractor.DotNet.VB.csproj" />
12+
<Project Path="src/OrchardCoreContrib.PoExtractor.DotNet/OrchardCoreContrib.PoExtractor.DotNet.csproj" />
13+
<Project Path="src/OrchardCoreContrib.PoExtractor.Liquid/OrchardCoreContrib.PoExtractor.Liquid.csproj" />
14+
<Project Path="src/OrchardCoreContrib.PoExtractor.Razor/OrchardCoreContrib.PoExtractor.Razor.csproj" />
15+
<Project Path="src/OrchardCoreContrib.PoExtractor/OrchardCoreContrib.PoExtractor.csproj" />
16+
</Folder>
17+
<Folder Name="/test/">
18+
<Project Path="test/OrchardCoreContrib.PoExtractor.Core.Tests/OrchardCoreContrib.PoExtractor.Abstractions.Tests.csproj" />
19+
<Project Path="test/OrchardCoreContrib.PoExtractor.DotNet.CS.Tests/OrchardCoreContrib.PoExtractor.DotNet.CS.Tests.csproj" />
20+
<Project Path="test/OrchardCoreContrib.PoExtractor.DotNet.VB.Tests/OrchardCoreContrib.PoExtractor.DotNet.VB.Tests.csproj" />
21+
<Project Path="test/OrchardCoreContrib.PoExtractor.Liquid.Tests/OrchardCoreContrib.PoExtractor.Liquid.Tests.csproj" />
22+
<Project Path="test/OrchardCoreContrib.PoExtractor.Tests/OrchardCoreContrib.PoExtractor.Tests.csproj" />
23+
</Folder>
24+
</Solution>

global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)