Skip to content

Commit

Permalink
Merge pull request #42 from stefannikolei/sn/net8
Browse files Browse the repository at this point in the history
Update testproject to net8 and c# to 12
  • Loading branch information
JimBobSquarePants authored Dec 1, 2023
2 parents c6fda62 + 9e1388e commit 4e89295
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
matrix:
options:
- os: ubuntu-latest
framework: net6.0
framework: net8.0
runtime: -x64
codecov: false
- os: macos-latest
framework: net6.0
framework: net8.0
runtime: -x64
codecov: false
- os: windows-latest
framework: net6.0
framework: net8.0
runtime: -x64
codecov: true

Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
8.0.x
- name: DotNet Build
shell: pwsh
Expand Down
4 changes: 2 additions & 2 deletions msbuild/props/SixLabors.Global.props
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<!-- Compilation settings that explicitly differ from the Sdk.props/targets defaults -->
<PropertyGroup>
<LangVersion>10.0</LangVersion>
<LangVersion>12.0</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Features>strict;IOperation</Features>
<HighEntropyVA>true</HighEntropyVA>
Expand Down Expand Up @@ -115,7 +115,7 @@

<!-- Package references and additional files which are consumed by all projects. -->
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" IsImplicitlyDefined="true">
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" IsImplicitlyDefined="true">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions msbuild/props/SixLabors.Src.props
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
<!-- Package references and additional files which are consumed by src projects. CI Only -->
<ItemGroup Condition="'$(IsContinuousIntegration)'=='true'">
<PackageReference Include="Microsoft.SourceLink.GitHub"
Version="1.1.1"
Version="8.0.0"
PrivateAssets="All"
IsImplicitlyDefined="true" />

<PackageReference Include="MinVer"
PrivateAssets="All"
Version="4.1.0"
Version="4.3.0"
IsImplicitlyDefined="true"/>
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions msbuild/props/SixLabors.Tests.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@

<!-- Package references and additional files which are consumed by test projects -->
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<PackageReference Include="xunit" Version="2.4.2" IsImplicitlyDefined="true" />
<PackageReference Include="xunit" Version="2.6.2" IsImplicitlyDefined="true" />

<PackageReference Include="coverlet.collector"
Version="3.1.2"
Version="6.0.0"
PrivateAssets="All"
IsImplicitlyDefined="true"
Condition="'$(IsCodeCoverage)'=='true'"/>

<PackageReference Include="Microsoft.NET.Test.Sdk"
Version="17.4.1"
Version="17.8.0"
IsImplicitlyDefined="true"/>

<PackageReference Include="xunit.runner.visualstudio"
Version="2.4.5"
Version="2.5.4"
IsImplicitlyDefined="true" />

<Using Include="Xunit" Condition="'$(ImplicitUsings)'=='enable' OR '$(ImplicitUsings)'=='true'"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;</TargetFrameworks>
<TargetFrameworks>net8.0;</TargetFrameworks>
<AssemblyName>SharedInfrastructure.Tests</AssemblyName>
<RootNamespace>SharedInfrastructure.Tests</RootNamespace>
<Nullable>enable</Nullable>
Expand Down

0 comments on commit 4e89295

Please sign in to comment.