diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..55fae0b --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,20 @@ + + + + + + + net8.0 + + + + 10.0 + $(NoWarn) + true + true + portable + false + WebLinking + + + diff --git a/WebLinking.sln b/WebLinking.sln index 7efa285..8957be2 100644 --- a/WebLinking.sln +++ b/WebLinking.sln @@ -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}" @@ -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 diff --git a/global.json b/global.json index 02f30aa..d031a76 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.403", + "version": "8.0.200", "rollForward": "latestPatch" } } diff --git a/props/dependencies.props b/props/dependencies.props index e7fccc0..8416335 100644 --- a/props/dependencies.props +++ b/props/dependencies.props @@ -1,9 +1,9 @@ - 2.9.0 - 4.14.6 - 16.7.1 - 2.4.1 - 2.4.1 + 6.0.3 + 4.20.72 + 17.11.1 + 2.9.2 + 3.0.1 diff --git a/props/package.props b/props/package.props index 34daed6..2e0fe5e 100644 --- a/props/package.props +++ b/props/package.props @@ -32,7 +32,7 @@ - net6.0 + net8.0 diff --git a/props/version.props b/props/version.props index 0292cb9..31aaaa8 100644 --- a/props/version.props +++ b/props/version.props @@ -1,7 +1,7 @@ - 3.0.0 + 4.0.0 $(VersionSuffix).$(BuildNumber) diff --git a/samples/simple-api/WebLinking.Samples.SimpleApi/WebLinking.Samples.SimpleApi.csproj b/samples/simple-api/WebLinking.Samples.SimpleApi/WebLinking.Samples.SimpleApi.csproj index b7dc99c..948fe28 100644 --- a/samples/simple-api/WebLinking.Samples.SimpleApi/WebLinking.Samples.SimpleApi.csproj +++ b/samples/simple-api/WebLinking.Samples.SimpleApi/WebLinking.Samples.SimpleApi.csproj @@ -1,22 +1,13 @@ - - - - - net6.0 - - - ResXFileCodeGenerator Resources.Designer.cs - True @@ -24,6 +15,4 @@ Resources.resx - - - + \ No newline at end of file diff --git a/src/WebLinking.Core/WebLinking.Core.csproj b/src/WebLinking.Core/WebLinking.Core.csproj index d8c6c15..26a3fdf 100644 --- a/src/WebLinking.Core/WebLinking.Core.csproj +++ b/src/WebLinking.Core/WebLinking.Core.csproj @@ -1,11 +1,8 @@ - - - - + + WebLinking Core WebLinking.Core A .NET implementation of the Web Linking proposed standard RFC8288 - - + \ No newline at end of file diff --git a/src/WebLinking.Integration.AspNetCore/WebLinking.Integration.AspNetCore.csproj b/src/WebLinking.Integration.AspNetCore/WebLinking.Integration.AspNetCore.csproj index 9510f20..c761b21 100644 --- a/src/WebLinking.Integration.AspNetCore/WebLinking.Integration.AspNetCore.csproj +++ b/src/WebLinking.Integration.AspNetCore/WebLinking.Integration.AspNetCore.csproj @@ -1,20 +1,15 @@ - - - - + + WebLinking Integration Asp.Net Core WebLinking.Integration.AspNetCore Asp.Net Integration for WebLinking - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/tests/WebLinking.Core.Tests.UnitTests/WebLinking.Core.Tests.UnitTests.csproj b/tests/WebLinking.Core.Tests.UnitTests/WebLinking.Core.Tests.UnitTests.csproj index dd71f03..9e3375e 100644 --- a/tests/WebLinking.Core.Tests.UnitTests/WebLinking.Core.Tests.UnitTests.csproj +++ b/tests/WebLinking.Core.Tests.UnitTests/WebLinking.Core.Tests.UnitTests.csproj @@ -1,19 +1,14 @@ - - net6.0 false - - - - - + + + + - - + - - + \ No newline at end of file diff --git a/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/Mvc/PagedCollectionResultTest.cs b/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/Mvc/PagedCollectionResultTest.cs index 4ba304d..43a58ae 100644 --- a/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/Mvc/PagedCollectionResultTest.cs +++ b/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/Mvc/PagedCollectionResultTest.cs @@ -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(_pagedCollectionMock.Object); - Assert.ThrowsAsync( + await Assert.ThrowsAsync( () => pagedCollectionResult.ExecuteResultAsync(null)); } @@ -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( diff --git a/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/WebLinking.Integration.AspNetCore.Tests.UnitTests.csproj b/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/WebLinking.Integration.AspNetCore.Tests.UnitTests.csproj index 88b1a38..e031707 100644 --- a/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/WebLinking.Integration.AspNetCore.Tests.UnitTests.csproj +++ b/tests/WebLinking.Integration.AspNetCore.Tests.UnitTests/WebLinking.Integration.AspNetCore.Tests.UnitTests.csproj @@ -1,20 +1,15 @@ - - net6.0 false - - - - - - + + + + + - - + - - + \ No newline at end of file