Skip to content

Commit b07e028

Browse files
0xced0xced
committed
Update dependencies and cleanup projects
* Update test projects from .NET Core 3.1 (out of support) to .NET 6 (LTS) * Remove `<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />` (see microsoft/vstest#472 (comment)) * Remove `<LangVersion>7.2</LangVersion>` on test projects * Fix `Run_Specifies_Cancellation_Token` which (rightfully) throws when running on .NET 6
1 parent 63b4f6c commit b07e028

File tree

11 files changed

+28
-88
lines changed

11 files changed

+28
-88
lines changed

‎Octokit.GraphQL.Core.Generation.UnitTests/Octokit.GraphQL.Core.Generation.UnitTests.csproj‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<LangVersion>7.2</LangVersion>
3+
<TargetFramework>net6.0</TargetFramework>
54
</PropertyGroup>
65
<ItemGroup>
7-
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
8-
<PrivateAssets>all</PrivateAssets>
9-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
10-
</PackageReference>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
12-
<PackageReference Include="xunit" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16-
</PackageReference>
6+
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
8+
<PackageReference Include="xunit" Version="2.5.0" />
9+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="all" />
1710
</ItemGroup>
1811
<ItemGroup>
1912
<ProjectReference Include="..\Octokit.GraphQL.Core.Generation\Octokit.GraphQL.Core.Generation.csproj" />
2013
</ItemGroup>
21-
<ItemGroup>
22-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
23-
</ItemGroup>
2414
</Project>

‎Octokit.GraphQL.Core.Generation/Octokit.GraphQL.Core.Generation.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
<ItemGroup>
77
<ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
88
</ItemGroup>
9-
<ItemGroup>
10-
<Folder Include="Properties\" />
11-
</ItemGroup>
129
</Project>

‎Octokit.GraphQL.Core.UnitTests/ConnectionTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static async Task Run_Specifies_Cancellation_Token()
7070

7171
var connection = new Connection(ProductInformation, CredentialStore, httpClient);
7272

73-
await connection.Run(query, cancellationToken);
73+
await Assert.ThrowsAsync<TaskCanceledException>(() => connection.Run(query, cancellationToken));
7474
}
7575

7676
[Theory]

‎Octokit.GraphQL.Core.UnitTests/Octokit.GraphQL.Core.UnitTests.csproj‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<LangVersion>7.2</LangVersion>
3+
<TargetFramework>net6.0</TargetFramework>
54
</PropertyGroup>
65
<ItemGroup>
7-
<PackageReference Include="AgileObjects.ReadableExpressions" Version="1.12.1" />
8-
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
11-
</PackageReference>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
6+
<PackageReference Include="AgileObjects.ReadableExpressions" Version="4.1.0" />
7+
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
9+
<PackageReference Include="xunit" Version="2.5.0" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="all" />
1811
</ItemGroup>
1912
<ItemGroup>
2013
<ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
2114
</ItemGroup>
22-
<ItemGroup>
23-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
24-
</ItemGroup>
2515
</Project>

‎Octokit.GraphQL.Core/Octokit.GraphQL.Core.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
77
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
8-
<DocumentationFile>bin\$(Configuration)\netstandard1.1\Octokit.GraphQL.Core.xml</DocumentationFile>
98
<LangVersion>7.2</LangVersion>
109
</PropertyGroup>
1110
<ItemGroup>
12-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
13-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
14-
</ItemGroup>
15-
<ItemGroup>
16-
<Folder Include="Properties\" />
11+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1712
</ItemGroup>
1813
</Project>

‎Octokit.GraphQL.IntegrationTests/Octokit.GraphQL.IntegrationTests.csproj‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<AssemblyName>Octokit.GraphQL.IntegrationTests</AssemblyName>
5-
<LangVersion>7.2</LangVersion>
3+
<TargetFramework>net6.0</TargetFramework>
64
</PropertyGroup>
75
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
11-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
12-
<PackageReference Include="Octokit" Version="0.29.0" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
6+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
7+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
10+
<PackageReference Include="Octokit" Version="7.1.0" />
11+
<PackageReference Include="xunit" Version="2.5.0" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="all" />
1813
</ItemGroup>
1914
<ItemGroup>
2015
<ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
2116
<ProjectReference Include="..\Octokit.GraphQL\Octokit.GraphQL.csproj" />
2217
</ItemGroup>
23-
<ItemGroup>
24-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
25-
</ItemGroup>
2618
</Project>

‎Octokit.GraphQL.UnitTests/Octokit.GraphQL.UnitTests.csproj‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<LangVersion>7.2</LangVersion>
3+
<TargetFramework>net6.0</TargetFramework>
54
</PropertyGroup>
65
<ItemGroup>
7-
<PackageReference Include="Codecov" Version="1.10.0" />
8-
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
11-
</PackageReference>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
6+
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
8+
<PackageReference Include="xunit" Version="2.5.0" />
9+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="all" />
1810
</ItemGroup>
1911
<ItemGroup>
2012
<ProjectReference Include="..\Octokit.GraphQL.Core.UnitTests\Octokit.GraphQL.Core.UnitTests.csproj" />
2113
<ProjectReference Include="..\Octokit.GraphQL\Octokit.GraphQL.csproj" />
2214
</ItemGroup>
23-
<ItemGroup>
24-
<Folder Include="Properties\" />
25-
</ItemGroup>
26-
<ItemGroup>
27-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
28-
</ItemGroup>
2915
</Project>

‎Octokit.GraphQL.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
66
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
77
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
8+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
89
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
910
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
1011
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

‎Octokit.GraphQL/Octokit.GraphQL.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
<SignAssembly>true</SignAssembly>
55
<AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
66
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
7-
<DocumentationFile>bin\$(Configuration)\netstandard1.1\Octokit.GraphQL.xml</DocumentationFile>
87
<LangVersion>7.2</LangVersion>
98
</PropertyGroup>
109
<ItemGroup>
1110
<ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
1211
</ItemGroup>
13-
<ItemGroup>
14-
<Folder Include="Properties\" />
15-
</ItemGroup>
1612
</Project>

‎Tools/Generate/App.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)