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

Porting to .NET 8. #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Porting to .NET 8. #9

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
20 changes: 20 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project>

<Import Project="Props\dependencies.props"/>
<Import Project="Props\version.props"/>

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

<PropertyGroup>
<LangVersion>10.0</LangVersion>
<NoWarn>$(NoWarn)</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugSymbols>true</DebugSymbols>
<DebugType Condition=" '$(Configuration)' != 'Debug' ">portable</DebugType>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<Product>WebLinking</Product>
</PropertyGroup>

</Project>
23 changes: 13 additions & 10 deletions WebLinking.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2046
# Visual Studio Version 17
VisualStudioVersion = 17.9.34607.119
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".misc", ".misc", "{09528F97-9EB1-4059-AAE2-B849A6C76390}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
README.md = README.md
LICENSE = LICENSE
global.json = global.json
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{968D2F6F-40CC-41D9-84DF-CBDF9A2778B9}"
Expand All @@ -19,23 +18,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebLinking.Core", "src\WebL
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{EEC1A317-BA7A-4865-9670-359133D9F7C6}"
ProjectSection(SolutionItems) = preProject
props\common.props = props\common.props
props\dependencies.props = props\dependencies.props
props\version.props = props\version.props
props\package.props = props\package.props
props\version.props = props\version.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebLinking.Integration.AspNetCore", "src\WebLinking.Integration.AspNetCore\WebLinking.Integration.AspNetCore.csproj", "{01BF230E-3F73-4306-9179-3572B6DB8122}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{202EC000-1A0D-48C8-BB58-34A8E83D54F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebLinking.Core.Tests.UnitTests", "tests\WebLinking.Core.Tests.UnitTests\WebLinking.Core.Tests.UnitTests.csproj", "{ABF4B9E7-6DDD-45B8-98B5-C4DBB24145D2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebLinking.Core.Tests.UnitTests", "tests\WebLinking.Core.Tests.UnitTests\WebLinking.Core.Tests.UnitTests.csproj", "{ABF4B9E7-6DDD-45B8-98B5-C4DBB24145D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebLinking.Integration.AspNetCore.Tests.UnitTests", "tests\WebLinking.Integration.AspNetCore.Tests.UnitTests\WebLinking.Integration.AspNetCore.Tests.UnitTests.csproj", "{D03B4E79-5870-4693-B521-ECE08A6FFA9E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebLinking.Integration.AspNetCore.Tests.UnitTests", "tests\WebLinking.Integration.AspNetCore.Tests.UnitTests\WebLinking.Integration.AspNetCore.Tests.UnitTests.csproj", "{D03B4E79-5870-4693-B521-ECE08A6FFA9E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{46141B0F-3E8D-46FA-A3E0-6B6E9A916172}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebLinking.Samples.SimpleApi", "samples\simple-api\WebLinking.Samples.SimpleApi\WebLinking.Samples.SimpleApi.csproj", "{1D0FAAB2-3F55-4BB3-A0C0-B492484CEC25}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebLinking.Samples.SimpleApi", "samples\simple-api\WebLinking.Samples.SimpleApi\WebLinking.Samples.SimpleApi.csproj", "{1D0FAAB2-3F55-4BB3-A0C0-B492484CEC25}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0F13E0F6-44AB-419F-AAFE-E9D450966414}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.403",
"version": "8.0.200",
"rollForward": "latestPatch"
}
}
10 changes: 5 additions & 5 deletions props/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup Label="Package Versions">
<CoverletMsBuildVersion>2.9.0</CoverletMsBuildVersion>
<MoqVersion>4.14.6</MoqVersion>
<TestSdkVersion>16.7.1</TestSdkVersion>
<XunitVersion>2.4.1</XunitVersion>
<XUnitRunnerVersion>2.4.1</XUnitRunnerVersion>
<CoverletMsBuildVersion>6.0.3</CoverletMsBuildVersion>
<MoqVersion>4.20.72</MoqVersion>
<TestSdkVersion>17.11.1</TestSdkVersion>
<XunitVersion>2.9.2</XunitVersion>
<XUnitRunnerVersion>3.0.1</XUnitRunnerVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion props/package.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</PropertyGroup>

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion props/version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<VersionPrefix>3.0.0</VersionPrefix>
<VersionPrefix>4.0.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
13 changes: 1 addition & 12 deletions samples/simple-api/WebLinking.Samples.SimpleApi/WebLinking.Samples.SimpleApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="..\..\..\props\common.props" />

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\WebLinking.Integration.AspNetCore\WebLinking.Integration.AspNetCore.csproj" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>


</Project>
</Project>
9 changes: 3 additions & 6 deletions src/WebLinking.Core/WebLinking.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\props\common.props"/>
<Import Project="..\..\props\package.props"/>

<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\props\package.props" />
<PropertyGroup>
<Title>WebLinking Core</Title>
<PackageId>WebLinking.Core</PackageId>
<PackageDescription>A .NET implementation of the Web Linking proposed standard RFC8288</PackageDescription>
</PropertyGroup>

</Project>
</Project>
25 changes: 10 additions & 15 deletions src/WebLinking.Integration.AspNetCore/WebLinking.Integration.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\props\common.props"/>
<Import Project="..\..\props\package.props"/>

<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\props\package.props" />
<PropertyGroup>
<Title>WebLinking Integration Asp.Net Core</Title>
<PackageId>WebLinking.Integration.AspNetCore</PackageId>
<PackageDescription>Asp.Net Integration for WebLinking</PackageDescription>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WebLinking.Core\WebLinking.Core.csproj" />
</ItemGroup>

</Project>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WebLinking.Core\WebLinking.Core.csproj" />
</ItemGroup>
</Project>
17 changes: 6 additions & 11 deletions tests/WebLinking.Core.Tests.UnitTests/WebLinking.Core.Tests.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\props\common.props"/>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMsBuildVersion)"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)"/>
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)"/>
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMsBuildVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\WebLinking.Core\WebLinking.Core.csproj"/>
<ProjectReference Include="..\..\src\WebLinking.Core\WebLinking.Core.csproj" />
</ItemGroup>

</Project>
</Project>
7 changes: 3 additions & 4 deletions tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/Mvc/PagedCollectionResultTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public void Constructor_Throws_When_PagedCollection_Is_Null()
}

[Fact]
public void ExecuteResultAsync_Throws_When_Context_Is_Null()
public async Task ExecuteResultAsync_Throws_When_Context_Is_Null()
{
var pagedCollectionResult =
new PagedCollectionResult<object>(_pagedCollectionMock.Object);

Assert.ThrowsAsync<ArgumentNullException>(
await Assert.ThrowsAsync<ArgumentNullException>(
() => pagedCollectionResult.ExecuteResultAsync(null));
}

Expand All @@ -78,8 +78,7 @@ public async Task
new RouteData(),
new ActionDescriptor());

await pagedCollectionResult.ExecuteResultAsync(actionContext)
.ConfigureAwait(false);
await pagedCollectionResult.ExecuteResultAsync(actionContext);

_headerDictionaryMock.Verify(
x => x.Add(
Expand Down
19 changes: 7 additions & 12 deletions ...ation.AspNetCore.Tests.UnitTests/WebLinking.Integration.AspNetCore.Tests.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\props\common.props"/>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMsBuildVersion)"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)"/>
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)"/>
<PackageReference Include="Moq" Version="$(MoqVersion)"/>
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMsBuildVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\WebLinking.Integration.AspNetCore\WebLinking.Integration.AspNetCore.csproj"/>
<ProjectReference Include="..\..\src\WebLinking.Integration.AspNetCore\WebLinking.Integration.AspNetCore.csproj" />
</ItemGroup>

</Project>
</Project>