Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
dotnet-version: |
8.0.x
global-json-file: global.json

- name: Test
run: dotnet test -c Release --logger GitHubActions

- name: Test - Compiled
run: dotnet test --configuration Release --logger GitHubActions /p:Compiled=true

- name: Pack
run: |
PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts"
PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts"
dotnet pack --property:PackageOutputPath=$PACKAGE_PATH --configuration Release -p:PackageVersion=$GITHUB_RUN_NUMBER -p:ContinuousIntegrationBuild=True

- name: Publish on MyGet
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
dotnet-version: |
8.0.x
global-json-file: global.json

- name: Version
run: dotnet --version

- name: Test
run: dotnet test -c Release --logger GitHubActions

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish

on:
push:
tags:
tags:
- v*

jobs:
Expand All @@ -17,8 +17,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
dotnet-version: |
8.0.x
global-json-file: global.json

Expand All @@ -31,7 +30,7 @@ jobs:
arrTag=(${GITHUB_REF//\// })
VERSION="${arrTag[2]}"
VERSION="${VERSION//v}"
PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts"
PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts"
echo "$VERSION"
dotnet pack --property:PackageOutputPath=$PACKAGE_PATH --configuration Release -p:Version=$VERSION -p:ContinuousIntegrationBuild=True

Expand Down
6 changes: 1 addition & 5 deletions Fluid.MvcViewEngine/Fluid.MvcViewEngine.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<PackageIcon>logo_64x64.png</PackageIcon>
<IsPackable>true</IsPackable>
Expand All @@ -20,10 +20,6 @@
<ProjectReference Include="..\Fluid.ViewEngine\Fluid.ViewEngine.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="8.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Fluid.Tests/Fluid.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<DefineConstants Condition="'$(Compiled)' == 'true'">$(DefineConstants);COMPILED</DefineConstants>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion Fluid.ViewEngine/Fluid.ViewEngine.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<IsPackable>true</IsPackable>
<PackageIcon>logo_64x64.png</PackageIcon>
Expand Down
11 changes: 2 additions & 9 deletions Fluid/Fluid.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>latest</LangVersion>
<IsPackable>true</IsPackable>
Expand All @@ -12,8 +12,6 @@
<PackageIcon>logo_64x64.png</PackageIcon>
<ImplicitUsings>true</ImplicitUsings>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<!-- Ingore missing comments errors and obsolete TFMs -->
<NoWarn>$(NoWarn);CS1591;NETSDK1138</NoWarn>

<AnalysisLevel>latest-Recommended</AnalysisLevel>
<NoWarn>$(NoWarn);CA1016</NoWarn> <!-- CA1016: Mark assemblies with AssemblyVersionAttribute -->
Expand All @@ -40,17 +38,12 @@
<PackageReference Include="TimeZoneConverter" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))">
<PackageReference Include="System.Text.Json" />
<PackageReference Include="Microsoft.CSharp" />
<PackageReference Include="System.Reflection.Emit.Lightweight" />
</ItemGroup>

<!-- Keep specific targets since it removes some dependencies -->
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Text.Json" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
</ItemGroup>

Expand Down
5 changes: 0 additions & 5 deletions Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
</PropertyGroup>
Expand Down