Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated to .Net 8 #62

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Updated to .Net 8 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Statiq.Docs.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{321DAC19-C19
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Statiq.Docs", "src\Statiq.Docs\Statiq.Docs.csproj", "{567B5D3B-6093-4405-9A6A-466E0FB316EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Statiq.Docs.Templates", "src\Statiq.Docs.Templates\Statiq.Docs.Templates.csproj", "{1A749683-7702-4D24-A14E-AC5A83803846}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Statiq.Docs.Templates", "src\Statiq.Docs.Templates\Statiq.Docs.Templates.csproj", "{1A749683-7702-4D24-A14E-AC5A83803846}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{73F82A2D-EEAE-4079-9870-4628DE69D99F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Statiq.Docs.Tests", "tests\Statiq.Docs.Tests\Statiq.Docs.Tests.csproj", "{8097207F-AE90-47FF-9FBE-8BE86F0E1F7F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Statiq.Docs.Tests", "tests\Statiq.Docs.Tests\Statiq.Docs.Tests.csproj", "{8097207F-AE90-47FF-9FBE-8BE86F0E1F7F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
10 changes: 5 additions & 5 deletions src/Statiq.Docs.Templates/Statiq.Docs.Templates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageType>Template</PackageType>
<PackageId>Statiq.Docs.Templates</PackageId>
<Title>Statiq Docs Templates</Title>
<Authors>Dave Glick</Authors>
<Description>Templates to use when creating a Statiq Docs application, Statiq Docs is a flexible static site generator.</Description>
<PackageTags>dotnet-new;templates;Statiq;Static;StaticContent;StaticSite;Blog;BlogEngine </PackageTags>

<IncludeContentInPack>true</IncludeContentInPack>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<ContentTargetFolders>content</ContentTargetFolders>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**;templates\**\.vs\**" />
<Compile Remove="**\*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
</ItemGroup>
<Target Name="VersionBuild" BeforeTargets="PrepareForBuild">
<XmlPoke XmlInputPath="templates\statiq-docs\Statiq.Docs.Template.csproj" Query="Project/ItemGroup/PackageReference/@Version" Value="$(Version)" />
<XmlPoke XmlInputPath="templates\statiq-docs\Statiq.Docs.Template.csproj" Query="Project/ItemGroup/PackageReference/@Version" Value="$(Version)" />
</Target>
</Project>
9 changes: 2 additions & 7 deletions src/Statiq.Docs/Statiq.Docs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Description>Statiq Docs is a flexible API documentation generator.</Description>
<PackageTags>Statiq Static StaticContent StaticSite Documentation Docs</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="Statiq.Docs.targets" Pack="true" PackagePath="build\$(TargetFramework)\" />
<None Include="Statiq.Docs.targets" Pack="true" PackagePath="buildTransitive\$(TargetFramework)\" />
</ItemGroup>

<Choose>
<When Condition=" '$(StatiqWebVersion)' == ''">
<ItemGroup>
Expand All @@ -23,7 +20,6 @@
</ItemGroup>
</Otherwise>
</Choose>

<Choose>
<When Condition=" '$(StatiqFrameworkVersion)' == ''">
<ItemGroup>
Expand All @@ -36,5 +32,4 @@
</ItemGroup>
</Otherwise>
</Choose>

</Project>
8 changes: 4 additions & 4 deletions tests/Statiq.Docs.Tests/Statiq.Docs.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Statiq.Docs\Statiq.Docs.csproj" />
</ItemGroup>

<Choose>
<When Condition=" '$(StatiqFrameworkVersion)' == ''">
<ItemGroup>
Expand All @@ -19,9 +18,10 @@
</ItemGroup>
</Otherwise>
</Choose>

<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<DefineConstants>Is_Windows</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>