Skip to content

Commit 665c07f

Browse files
committed
Update to .NET 7 SDK & targets
1 parent d19632e commit 665c07f

7 files changed

Lines changed: 10 additions & 8 deletions

File tree

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ install:
1515
- ps: |
1616
if ($isWindows) {
1717
./dotnet-install.ps1 -JsonFile global.json
18+
./dotnet-install.ps1 -Runtime dotnet -Version 6.0.12 -SkipNonVersionedFiles
1819
./dotnet-install.ps1 -Runtime dotnet -Version 3.1.22 -SkipNonVersionedFiles
1920
}
2021
- sh: |
2122
curl -OsSL https://dot.net/v1/dotnet-install.sh
2223
chmod +x dotnet-install.sh
2324
./dotnet-install.sh --jsonfile global.json
25+
./dotnet-install.sh --runtime dotnet --version 6.0.12 --skip-non-versioned-files
2426
./dotnet-install.sh --runtime dotnet --version 3.1.22 --skip-non-versioned-files
2527
export PATH="$HOME/.dotnet:$PATH"
2628
before_build:

eg/SourceGenerator/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..'))" />
44

55
<PropertyGroup>
6-
<TargetFramework>net6.0</TargetFramework>
6+
<TargetFramework>net7.0</TargetFramework>
77
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
88
<DebugDocoptNet>false</DebugDocoptNet>
99
</PropertyGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.200",
3+
"version": "7.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

tests/DocoptNet.Tests/DocoptNet.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netcoreapp3.1;net47</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net6.0;netcoreapp3.1;net47</TargetFrameworks>
55
<AssemblyOriginatorKeyFile>..\..\src\DocoptNet\DocoptNet.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
77
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
@@ -25,13 +25,13 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Basic.Reference.Assemblies" Version="1.2.4" />
28+
<PackageReference Include="Basic.Reference.Assemblies" Version="1.4.1" />
2929
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
3030
<PackageReference Include="morelinq" Version="3.3.2" />
3131
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
3232
<PackageReference Include="nunit" Version="3.13.2" />
3333
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
34-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
3535
<PackageReference Include="Shouldly" Version="4.0.3" />
3636
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3737
</ItemGroup>

tests/DocoptNet.Tests/Extensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static partial class Extensions
99
{
1010
public static MatchResult Match(this Pattern pattern, params LeafPattern[] left)
1111
{
12-
return PatternMatcher.Match(pattern, left.AsReadOnly());
12+
return PatternMatcher.Match(pattern, new ReadOnlyList<LeafPattern>(left));
1313
}
1414

1515
public static IDictionary<string, ArgValue>? Apply(this Docopt docopt,

tests/Integration/DocoptNet.Tests.Integration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<RestoreAdditionalProjectSources>$(MSBuildThisFileDirectory)..\..\dist</RestoreAdditionalProjectSources>
77
<RestorePackagesPath>$(MSBuildThisFileDirectory).nuget</RestorePackagesPath>

tests/LanguageAgnosticTests/Testee.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

0 commit comments

Comments
 (0)