Bump .NET SDK to 5.0.100, bump C# to 9.0
BizHawk.Tests executable needs to run in CI, but the 5.0 SDK image can't run Core 3.1 apps somehow, so I bumped that too
This commit is contained in:
parent
be536c67de
commit
0093c16d79
|
@ -13,7 +13,7 @@ build:
|
||||||
name: "$CI_HAWK_TMPARTIFACT_NAME"
|
name: "$CI_HAWK_TMPARTIFACT_NAME"
|
||||||
paths:
|
paths:
|
||||||
- output
|
- output
|
||||||
image: mcr.microsoft.com/dotnet/core/sdk:3.1
|
image: mcr.microsoft.com/dotnet/sdk:5.0
|
||||||
script:
|
script:
|
||||||
- if [ "$CI_COMMIT_REF_SLUG" == "release" ]; then Dist/UpdateVersionInfoForRelease.sh; fi
|
- if [ "$CI_COMMIT_REF_SLUG" == "release" ]; then Dist/UpdateVersionInfoForRelease.sh; fi
|
||||||
- Dist/BuildRelease.sh
|
- Dist/BuildRelease.sh
|
||||||
|
@ -21,7 +21,7 @@ build:
|
||||||
|
|
||||||
build_ext_tools:
|
build_ext_tools:
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
image: mcr.microsoft.com/dotnet/core/sdk:3.1
|
image: mcr.microsoft.com/dotnet/sdk:5.0
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
rules:
|
rules:
|
||||||
|
@ -32,7 +32,7 @@ build_ext_tools:
|
||||||
stage: test
|
stage: test
|
||||||
|
|
||||||
check_style:
|
check_style:
|
||||||
image: mcr.microsoft.com/dotnet/core/sdk:3.1
|
image: mcr.microsoft.com/dotnet/sdk:5.0
|
||||||
needs:
|
needs:
|
||||||
- job: build
|
- job: build
|
||||||
artifacts: false
|
artifacts: false
|
||||||
|
@ -95,7 +95,7 @@ run_tests:
|
||||||
reports:
|
reports:
|
||||||
junit:
|
junit:
|
||||||
- test_output/*.coverage.xml
|
- test_output/*.coverage.xml
|
||||||
image: mcr.microsoft.com/dotnet/core/sdk:3.1
|
image: mcr.microsoft.com/dotnet/sdk:5.0
|
||||||
needs:
|
needs:
|
||||||
- job: build
|
- job: build
|
||||||
artifacts: false
|
artifacts: false
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<AnalysisLevel>5</AnalysisLevel>
|
<AnalysisLevel>5</AnalysisLevel>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
|
<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
|
||||||
<LangVersion>8.0</LangVersion>
|
<LangVersion>9.0</LangVersion>
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
|
<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
|
||||||
<RunCodeAnalysis>false</RunCodeAnalysis>
|
<RunCodeAnalysis>false</RunCodeAnalysis>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "3.1.100",
|
"version": "5.0.100",
|
||||||
"rollForward": "latestFeature"
|
"rollForward": "latestFeature"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
<TargetFramework>net5.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="../MainSlnCommon.props" />
|
<Import Project="../MainSlnCommon.props" />
|
||||||
<Import Project="../../CommonNullable.props" />
|
<Import Project="../../CommonNullable.props" />
|
||||||
|
|
Loading…
Reference in New Issue