Merge pull request 6966 from release/v4.4.0 into master

51Degrees · Apr 7, 2022 · e85f0f7 · e85f0f7
2 parents 1a883f8 + 189ac1f
commit e85f0f7
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 24 deletions.
diff --git a/...ent/3. Client-side evidence/ClientSideEvidence.MVC/Examples.ClientSideEvidence.MVC.csproj b/...ent/3. Client-side evidence/ClientSideEvidence.MVC/Examples.ClientSideEvidence.MVC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...line.JavaScriptBuilderElementTests/FiftyOne.Pipeline.JavaScriptBuilderElementTests.csproj b/...line.JavaScriptBuilderElementTests/FiftyOne.Pipeline.JavaScriptBuilderElementTests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.3.5" />
+    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />

diff --git a/FiftyOne.Pipeline.Engines/FiftyOne.Pipeline.Engines.csproj b/FiftyOne.Pipeline.Engines/FiftyOne.Pipeline.Engines.csproj
@@ -37,8 +37,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FiftyOne.Caching" Version="4.3.5" />
-    <PackageReference Include="FiftyOne.Common" Version="4.3.5" />
+    <PackageReference Include="FiftyOne.Caching" Version="4.4.1" />
+    <PackageReference Include="FiftyOne.Common" Version="4.4.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/FiftyOne.Pipeline.Web.sln b/FiftyOne.Pipeline.Web.sln
@@ -59,8 +59,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{742190
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FiftyOne.Pipeline.JsonBuilder", "FiftyOne.Pipeline.Elements\FiftyOne.Pipeline.JsonBuilderElement\FiftyOne.Pipeline.JsonBuilder.csproj", "{DE895B27-976B-47CA-B7FD-8BFFBE24C80D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore 2.1 Example", "Web Integration\Examples\NetCore2.1\AspNetCore 2.1 Example.csproj", "{3D055691-022E-4F62-A674-6E513F2CD0A2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore 3.1 Example", "Web Integration\Examples\NetCore3.1\AspNetCore 3.1 Example.csproj", "{D3D54E8A-6674-4788-A177-55A3C2FFC9FF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FiftyOne.Pipeline.Web.Shared.Tests", "Web Integration\Tests\FiftyOne.Pipeline.Web.Shared.Tests\FiftyOne.Pipeline.Web.Shared.Tests.csproj", "{E9D230EE-88F0-4EC5-AF40-CEFFB8093251}"
@@ -199,14 +197,6 @@ Global
 		{DE895B27-976B-47CA-B7FD-8BFFBE24C80D}.LinuxRelease|Any CPU.Build.0 = Release|Any CPU
 		{DE895B27-976B-47CA-B7FD-8BFFBE24C80D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE895B27-976B-47CA-B7FD-8BFFBE24C80D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.LinuxDebug|Any CPU.Build.0 = Debug|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.LinuxRelease|Any CPU.Build.0 = Release|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D055691-022E-4F62-A674-6E513F2CD0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3D54E8A-6674-4788-A177-55A3C2FFC9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3D54E8A-6674-4788-A177-55A3C2FFC9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3D54E8A-6674-4788-A177-55A3C2FFC9FF}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -250,7 +240,6 @@ Global
 		{8DB8DAA4-A7EC-45B6-90D4-3803A5847E67} = {9D4F18BA-A1F6-4B92-9693-B6AFF09E3760}
 		{AF5A4BF7-6197-4E0F-B796-EC6630C1C9CD} = {C301ABC8-CB14-4ECE-9927-769C2871C349}
 		{7421904B-85D4-40C2-ACDD-8A668218CA2D} = {AF5A4BF7-6197-4E0F-B796-EC6630C1C9CD}
-		{3D055691-022E-4F62-A674-6E513F2CD0A2} = {AF5A4BF7-6197-4E0F-B796-EC6630C1C9CD}
 		{D3D54E8A-6674-4788-A177-55A3C2FFC9FF} = {AF5A4BF7-6197-4E0F-B796-EC6630C1C9CD}
 		{E9D230EE-88F0-4EC5-AF40-CEFFB8093251} = {5B0DFCCB-A77B-48AF-A50A-5AA3717A6697}
 		{439673A0-0255-403D-A412-5C5C9190A0F9} = {5B0DFCCB-A77B-48AF-A50A-5AA3717A6697}

diff --git a/...tyOne.Pipeline.CloudRequestEngine.Tests/FiftyOne.Pipeline.CloudRequestEngine.Tests.csproj b/...tyOne.Pipeline.CloudRequestEngine.Tests/FiftyOne.Pipeline.CloudRequestEngine.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.3.5" />
+    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />

diff --git a/.../FiftyOne.Pipeline.Engines.FiftyOne.Tests/FiftyOne.Pipeline.Engines.FiftyOne.Tests.csproj b/.../FiftyOne.Pipeline.Engines.FiftyOne.Tests/FiftyOne.Pipeline.Engines.FiftyOne.Tests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.3.5" />
+    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

diff --git a/Tests/FiftyOne.Pipeline.Engines.Tests/FiftyOne.Pipeline.Engines.Tests.csproj b/Tests/FiftyOne.Pipeline.Engines.Tests/FiftyOne.Pipeline.Engines.Tests.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.3.5" />
+    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />

diff --git a/...ration/Tests/FiftyOne.Pipeline.Web.Shared.Tests/FiftyOne.Pipeline.Web.Shared.Tests.csproj b/...ration/Tests/FiftyOne.Pipeline.Web.Shared.Tests/FiftyOne.Pipeline.Web.Shared.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.3.5" />
+    <PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />

diff --git a/ci/common-ci b/ci/common-ci
diff --git a/docs/Doxyfile b/docs/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "51Degrees Pipeline .NET"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.3
+PROJECT_NUMBER         = 4.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -56,7 +56,7 @@ PROJECT_LOGO           = ../../../docs/images/logo-51Degrees-Docs.png
 # The PROJECT_URL tag is used to specify the URL which is linked by the
 # PROJECT_LOGO.
 
-PROJECT_URL            = ../../documentation/4.3/index.html
+PROJECT_URL            = ../../documentation/4.4/index.html
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -1108,7 +1108,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = 4.3
+HTML_OUTPUT            = 4.4
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).

diff --git a/docs/DoxygenLayout.xml b/docs/DoxygenLayout.xml
@@ -2,7 +2,7 @@
   <!-- Generated by doxygen 1.8.15 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
-    <tab type="user" visible="yes" title="General Docs" url="../../documentation/4.3/index.html"/>
+    <tab type="user" visible="yes" title="General Docs" url="../../documentation/4.4/index.html"/>
     <tab type="pages" visible="yes" title="" intro=""/>
     <tab type="classlist" visible="yes" title="Classes" intro="51Degrees .NET classes. These contain the interfaces and logic of the Pipeline API."/>
     <tab type="examples" visible="yes" title="Examples" intro="51Degrees Pipeline API examples. These show how the API can be used for a few example use cases."/>
+26 −130		release-config.json
+52 −33		scripts/modules/51DGitModule/51DGitModule.psm1