Skip to content

Commit

Permalink
Merge pull request 6976 from release/v4.4.0 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Project Collection Build Service (51degrees) authored and Project Collection Build Service (51degrees) committed Apr 7, 2022
2 parents 303b120 + 98d9009 commit a352b3a
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Engines">
<Version>4.3.17</Version>
<Version>4.4.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FiftyOne.Caching" version="4.3.5" targetFramework="net472" />
<package id="FiftyOne.Common" version="4.3.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.3.17" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.3.17" targetFramework="net472" />
<package id="FiftyOne.Caching" version="4.4.1" targetFramework="net472" />
<package id="FiftyOne.Common" version="4.4.1" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.4.0" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.4.0" targetFramework="net472" />
<package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.Configuration.Binder" version="2.1.10" targetFramework="net472" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Engines">
<Version>4.3.17</Version>
<Version>4.4.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FiftyOne.Caching" version="4.3.5" targetFramework="net472" />
<package id="FiftyOne.Common" version="4.3.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.3.17" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.3.17" targetFramework="net472" />
<package id="FiftyOne.Caching" version="4.4.1" targetFramework="net472" />
<package id="FiftyOne.Common" version="4.4.1" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.4.0" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.4.0" targetFramework="net472" />
<package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.Configuration.Binder" version="2.1.10" targetFramework="net472" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Engines">
<Version>4.3.17</Version>
<Version>4.4.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.CloudRequestEngine" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.CloudRequestEngine" Version="4.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Engines.FiftyOne" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Engines.FiftyOne" Version="4.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.3.5" />
<PackageReference Include="FiftyOne.Pipeline.Engines.TestHelpers" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
<PackageReference Include="FiftyOne.Pipeline.Engines.TestHelpers" Version="4.4.0" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Moq" Version="4.13.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.3.5" />
<PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ci/common-ci
Submodule common-ci updated 1 files
+26 −129 release-config.json
8 changes: 4 additions & 4 deletions docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "51Degrees Device Detection .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
Expand All @@ -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
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -2178,7 +2178,7 @@ SKIP_FUNCTION_MACROS = NO
# the path). If a tag file is not located in the directory in which doxygen is
# run, you must also specify the path to the tagfile here.

TAGFILES = ../pipeline-dotnet/docs/tagfile=../../pipeline-dotnet/4.3/
TAGFILES = ../pipeline-dotnet/docs/tagfile=../../pipeline-dotnet/4.4/

# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
# tag file that is based on the input files it reads. See section "Linking to
Expand Down
2 changes: 1 addition & 1 deletion performance-tests/performance-tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.3.17" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit a352b3a

Please sign in to comment.