Fixup orchard module build

BrickmakersGmbH · Aug 29, 2024 · cc9bf16 · cc9bf16
1 parent 4887e05
commit cc9bf16
Show file tree

Hide file tree

Showing 19 changed files with 192 additions and 1,573 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,19 +25,19 @@ jobs:
  - macos-latest
  - windows-latest
  framework:
- - net7.0
+ - net8.0
  - net6.0
 
  exclude:
  - project: AspSecurityHeaders.OrchardModule.Test
- framework: netcoreapp3.1
+ framework: net6.0
  runs-on: ${{ matrix.platform }}
  steps:
  - name: Setup .NET
  uses: actions/setup-dotnet@v4
  with:
  dotnet-version: |
- 7.0.x
+ 8.0.x
  6.0.x
  - name: Checkout Code
  uses: actions/checkout@v4
@@ -71,7 +71,7 @@ jobs:
  uses: actions/setup-dotnet@v4
  with:
  dotnet-version: |
- 7.0.x
+ 8.0.x
  6.0.x
  - name: Checkout Code
  uses: actions/checkout@v4
@@ -155,7 +155,7 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v4
  with:
- dotnet-version: 7.0.x
+ dotnet-version: 8.0.x
  - name: Download NuGet package
  uses: actions/download-artifact@v4
  with:

diff --git a/AspSecurityHeaders.Example/AspSecurityHeaders.Example.csproj b/AspSecurityHeaders.Example/AspSecurityHeaders.Example.csproj
@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <RootNamespace>Brickmakers.AspSecurityHeaders.Example</RootNamespace>
- <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+ <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
  <LangVersion>default</LangVersion>
  <IsPackable>false</IsPackable>
  <Nullable>enable</Nullable>
@@ -19,11 +19,11 @@
  </PropertyGroup>
 
  <ItemGroup>
- <ProjectReference Include="..\AspSecurityHeaders\AspSecurityHeaders.csproj" />
+ <ProjectReference Include="..\AspSecurityHeaders\AspSecurityHeaders.csproj"/>
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3"/>
  </ItemGroup>
 
 </Project>
diff --git a/AspSecurityHeaders.Example/Startup.cs b/AspSecurityHeaders.Example/Startup.cs
@@ -34,7 +34,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
  // create "fake" server header to be removed by security headers
  app.Use(async (context, next) =>
  {
- context.Response.Headers.Add("Server", "ASP.Net Core");
+ context.Response.Headers.Append("Server", "ASP.Net Core");
  await next();
  });
 

diff --git a/AspSecurityHeaders.Example/packages.lock.json b/AspSecurityHeaders.Example/packages.lock.json
@@ -175,7 +175,7 @@
  }
  }
  },
- "net7.0": {
+ "net8.0": {
  "Swashbuckle.AspNetCore": {
  "type": "Direct",
  "requested": "[6.7.3, )",

diff --git a/AspSecurityHeaders.Generators.Test/AspSecurityHeaders.Generators.Test.csproj b/AspSecurityHeaders.Generators.Test/AspSecurityHeaders.Generators.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <RootNamespace>Brickmakers.AspSecurityHeaders.Generators.Test</RootNamespace>
- <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+ <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
  <LangVersion>default</LangVersion>
  <IsPackable>false</IsPackable>
  <Nullable>enable</Nullable>
@@ -17,9 +17,9 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FluentAssertions" Version="6.12.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
- <PackageReference Include="xunit" Version="2.9.0" />
+ <PackageReference Include="FluentAssertions" Version="6.12.0"/>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0"/>
+ <PackageReference Include="xunit" Version="2.9.0"/>
  <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
@@ -31,7 +31,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <ProjectReference Include="..\AspSecurityHeaders.Generators\AspSecurityHeaders.Generators.csproj" />
+ <ProjectReference Include="..\AspSecurityHeaders.Generators\AspSecurityHeaders.Generators.csproj"/>
  </ItemGroup>
 
 </Project>
diff --git a/AspSecurityHeaders.Generators.Test/packages.lock.json b/AspSecurityHeaders.Generators.Test/packages.lock.json
@@ -265,7 +265,7 @@
  }
  }
  },
- "net7.0": {
+ "net8.0": {
  "coverlet.collector": {
  "type": "Direct",
  "requested": "[6.0.2, )",

diff --git a/AspSecurityHeaders.Generators/AspSecurityHeaders.Generators.csproj b/AspSecurityHeaders.Generators/AspSecurityHeaders.Generators.csproj
@@ -2,7 +2,7 @@
 
  <PropertyGroup Label="Build Configuration">
  <RootNamespace>Brickmakers.AspSecurityHeaders.Generators</RootNamespace>
- <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+ <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
  <LangVersion>default</LangVersion>
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>enable</Nullable>

diff --git a/AspSecurityHeaders.Generators/packages.lock.json b/AspSecurityHeaders.Generators/packages.lock.json
@@ -132,7 +132,7 @@
  }
  }
  },
- "net7.0": {
+ "net8.0": {
  "Microsoft.AspNetCore.CookiePolicy": {
  "type": "Transitive",
  "resolved": "2.2.8",

diff --git a/AspSecurityHeaders.OrchardModule.Example/AspSecurityHeaders.OrchardModule.Example.csproj b/AspSecurityHeaders.OrchardModule.Example/AspSecurityHeaders.OrchardModule.Example.csproj
@@ -10,7 +10,7 @@
  <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
  <OpenApiGenerateDocumentsOnBuild>false</OpenApiGenerateDocumentsOnBuild>
  <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
- <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+ <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>
 
  <PropertyGroup>
@@ -20,15 +20,15 @@
  </PropertyGroup>
 
  <ItemGroup>
- <Folder Include="wwwroot\" />
+ <Folder Include="wwwroot\"/>
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="OrchardCore.Application.Mvc.Targets" Version="1.7.2" />
+ <PackageReference Include="OrchardCore.Application.Mvc.Targets" Version="1.8.3"/>
  </ItemGroup>
 
  <ItemGroup>
- <ProjectReference Include="..\AspSecurityHeaders.OrchardModule\AspSecurityHeaders.OrchardModule.csproj" />
+  <ProjectReference Include="..\AspSecurityHeaders.OrchardModule\AspSecurityHeaders.OrchardModule.csproj"/>
  </ItemGroup>
 
 </Project>