Skip to content

Commit

Permalink
Merge pull request 7300 from hotfix/v4.4.7 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ben51degrees authored and Project Collection Build Service (51degrees) committed Jun 22, 2022
2 parents d917d40 + 061672d commit 1d072b1
Show file tree
Hide file tree
Showing 27 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions Examples/Cloud/GettingStarted-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void Run(IServiceProvider serviceProvider, TextWriter output)

// In this example, we use the FiftyOnePipelineBuilder and configure it from a file.
// For more information about builders in general see the documentation at
// http://51degrees.com/documentation/_concepts__configuration__builders__index.html
// https://51degrees.com/documentation/_concepts__configuration__builders__index.html

// Create the pipeline using the service provider and the configured options.
using (var pipeline = new FiftyOnePipelineBuilder(loggerFactory, serviceProvider)
Expand Down Expand Up @@ -177,7 +177,7 @@ public void Run(PipelineOptions options, TextWriter output)
$"'{ExampleUtils.RESOURCE_KEY_ENV_VAR}'. The 51Degrees cloud " +
$"service is accessed using a 'ResourceKey'. For more information " +
$"see " +
$"http://51degrees.com/documentation/_info__resource_keys.html. " +
$"https://51degrees.com/documentation/_info__resource_keys.html. " +
$"A resource key with the properties required by this example can be " +
$"created for free at https://configure.51degrees.com/1QWJwHxl. " +
$"Once complete, populate the config file or environment variable " +
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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Cloud/GettingStarted-Web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private static Dictionary<string, string> CreateConfigOverrides()
$"'appsettings.json' or the environment variable " +
$"'{ExampleUtils.RESOURCE_KEY_ENV_VAR}'. The 51Degrees cloud " +
$"service is accessed using a 'ResourceKey'. For more information " +
$"see http://51degrees.com/documentation/_info__resource_keys.html. " +
$"see https://51degrees.com/documentation/_info__resource_keys.html. " +
$"A resource key with the properties required by this example can be " +
$"created for free at https://configure.51degrees.com/1QWJwHxl. " +
$"Once complete, populate the config file or environment variable " +
Expand Down
2 changes: 1 addition & 1 deletion Examples/Cloud/GettingStarted-Web/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
/// ```
///
/// Results can also be accessed in client-side code by using the `fod` object. See the
/// [JavaScriptBuilderElementBuilder](https://51degrees.com/pipeline-dotnet/4.3/class_fifty_one_1_1_pipeline_1_1_java_script_builder_1_1_flow_element_1_1_java_script_builder_element_builder.html)
/// [JavaScriptBuilderElementBuilder](https://51degrees.com/pipeline-dotnet/class_fifty_one_1_1_pipeline_1_1_java_script_builder_1_1_flow_element_1_1_java_script_builder_element_builder.html)
/// for details on available settings such as changing the `fod` name.
/// ```{js}
/// window.onload = function () {
Expand Down
2 changes: 1 addition & 1 deletion Examples/Cloud/Metadata-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static void Main(string[] args)
$"'appsettings.json' or the environment variable " +
$"'{ExampleUtils.RESOURCE_KEY_ENV_VAR}'. The 51Degrees cloud service is " +
$"accessed using a 'ResourceKey'. For more information see " +
$"http://51degrees.com/documentation/_info__resource_keys.html. " +
$"https://51degrees.com/documentation/_info__resource_keys.html. " +
$"A resource key with the properties required by this example can be " +
$"created for free at https://configure.51degrees.com/1QWJwHxl. " +
$"Once complete, supply the resource key as a command line argument or via " +
Expand Down
6 changes: 3 additions & 3 deletions Examples/Cloud/NativeModel-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void Run(string resourceKey, ILoggerFactory loggerFactory,
// This example creates the pipeline and engines in code. For a demonstration
// of how to do this using a configuration file instead, see the TacLookup example.
// For more information about builders in general see the documentation at
// http://51degrees.com/documentation/_concepts__configuration__builders__index.html
// https://51degrees.com/documentation/_concepts__configuration__builders__index.html
var cloudRequestEngineBuilder = new CloudRequestEngineBuilder(loggerFactory, httpClient)
.SetResourceKey(resourceKey);

Expand Down Expand Up @@ -153,10 +153,10 @@ static void Main(string[] args)
$"environment variable '{ExampleUtils.RESOURCE_KEY_ENV_VAR}'. " +
$"The 51Degrees cloud service is accessed using a 'ResourceKey'. " +
$"For more information " +
$"see http://51degrees.com/documentation/_info__resource_keys.html. " +
$"see https://51degrees.com/documentation/_info__resource_keys.html. " +
$"Native model lookup is not available as a free service. This means that " +
$"you will first need a license key, which can be purchased from our " +
$"pricing page: http://51degrees.com/pricing. Once this is done, a resource " +
$"pricing page: https://51degrees.com/pricing. Once this is done, a resource " +
$"key with the properties required by this example can be created at " +
$"https://configure.51degrees.com/QKyYH5XT. You can now populate the " +
$"environment variable mentioned at the start of this message with the " +
Expand Down
6 changes: 3 additions & 3 deletions Examples/Cloud/TAC-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void Run(IServiceProvider serviceProvider, TextWriter output)
// For a demonstration of how to do this in code instead, see the
// NativeModelLookup example.
// For more information about builders in general see the documentation at
// http://51degrees.com/documentation/_concepts__configuration__builders__index.html
// https://51degrees.com/documentation/_concepts__configuration__builders__index.html

// Create the pipeline using the service provider and the configured options.
using (var pipeline = new FiftyOnePipelineBuilder(loggerFactory, serviceProvider)
Expand Down Expand Up @@ -148,10 +148,10 @@ public void Run(PipelineOptions options, TextWriter output)
$"the environment variable '{ExampleUtils.RESOURCE_KEY_ENV_VAR}'. " +
$"The 51Degrees cloud service is accessed using a 'ResourceKey'. " +
$"For more information see " +
$"http://51degrees.com/documentation/_info__resource_keys.html. " +
$"https://51degrees.com/documentation/_info__resource_keys.html. " +
$"TAC lookup is not available as a free service. This means " +
$"that you will first need a license key, which can be purchased " +
$"from our pricing page: http://51degrees.com/pricing. Once this is " +
$"from our pricing page: https://51degrees.com/pricing. Once this is " +
$"done, a resource key with the properties required by this example " +
$"can be created at https://configure.51degrees.com/QKyYH5XT. You " +
$"can now populate the environment variable mentioned at the start " +
Expand Down
2 changes: 1 addition & 1 deletion Examples/Cloud/TAC-Console/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"BuilderName": "CloudRequestEngine",
// TAC lookup requires a license key, which can be purchased from our pricing page:
// http://51degrees.com/pricing. You can then obtain a resource key with the properties
// https://51degrees.com/pricing. You can then obtain a resource key with the properties
// required to run this example here: https://configure.51degrees.com/QKyYH5XT
"BuildParameters": {
"ResourceKey": "!!ENTER_YOUR_RESOURCE_KEY_HERE!!",
Expand Down
8 changes: 4 additions & 4 deletions Examples/OnPremise/GettingStarted-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ public void Run(string dataFile, ILoggerFactory loggerFactory, TextWriter output
{
// In this example, we use the DeviceDetectionPipelineBuilder and configure it
// in code. For more information about builders in general see the documentation at
// http://51degrees.com/documentation/_concepts__configuration__builders__index.html
// https://51degrees.com/documentation/_concepts__configuration__builders__index.html

// Note that we wrap the creation of a pipeline in a using to control its life cycle
using (var pipeline = new DeviceDetectionPipelineBuilder(loggerFactory)
.UseOnPremise(dataFile, null, false)
// We use the low memory profile as its performance is sufficient for this
// example. See the documentation for more detail on this and other
// configuration options:
// http://51degrees.com/documentation/_device_detection__features__performance_options.html
// http://51degrees.com/documentation/_features__automatic_datafile_updates.html
// http://51degrees.com/documentation/_features__usage_sharing.html
// https://51degrees.com/documentation/_device_detection__features__performance_options.html
// https://51degrees.com/documentation/_features__automatic_datafile_updates.html
// https://51degrees.com/documentation/_features__usage_sharing.html
.SetPerformanceProfile(PerformanceProfiles.LowMemory)
// inhibit sharing usage for this example, usually this should be set to "true"
.SetShareUsage(false)
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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/OnPremise/GettingStarted-Web/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
/// ```
///
/// Results can also be accessed in client-side code by using the `fod` object. See the
/// [JavaScriptBuilderElementBuilder](https://51degrees.com/pipeline-dotnet/4.3/class_fifty_one_1_1_pipeline_1_1_java_script_builder_1_1_flow_element_1_1_java_script_builder_element_builder.html)
/// [JavaScriptBuilderElementBuilder](https://51degrees.com/pipeline-dotnet/class_fifty_one_1_1_pipeline_1_1_java_script_builder_1_1_flow_element_1_1_java_script_builder_element_builder.html)
/// for details on available settings such as changing the `fod` name.
/// ```{js}
/// window.onload = function () {
Expand Down
4 changes: 2 additions & 2 deletions Examples/OnPremise/Metadata-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public void Run(string dataFile, ILoggerFactory loggerFactory, TextWriter output
// We use the low memory profile as its performance is sufficient for this
// example. See the documentation for more detail on this and other
// configuration options:
// http://51degrees.com/documentation/_device_detection__features__performance_options.html
// http://51degrees.com/documentation/_features__automatic_datafile_updates.html
// https://51degrees.com/documentation/_device_detection__features__performance_options.html
// https://51degrees.com/documentation/_features__automatic_datafile_updates.html
.SetPerformanceProfile(PerformanceProfiles.LowMemory)
// inhibit auto-update of the data file for this test
.SetAutoUpdate(false)
Expand Down
8 changes: 4 additions & 4 deletions Examples/OnPremise/OfflineProcessing-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@ public void Run(
var logger = loggerFactory.CreateLogger<Program>();
// In this example, we use the DeviceDetectionPipelineBuilder and configure it
// in code. For more information about builders in general see the documentation at
// http://51degrees.com/documentation/_concepts__configuration__builders__index.html
// https://51degrees.com/documentation/_concepts__configuration__builders__index.html

// Note that we wrap the creation of a pipeline in a using to control its life cycle
using (var pipeline = new DeviceDetectionPipelineBuilder(loggerFactory)
.UseOnPremise(dataFile, null, false)
// We use the low memory profile as its performance is sufficient for this
// example. See the documentation for more detail on this and other
// configuration options:
// http://51degrees.com/documentation/_device_detection__features__performance_options.html
// http://51degrees.com/documentation/_features__automatic_datafile_updates.html
// http://51degrees.com/documentation/_features__usage_sharing.html
// https://51degrees.com/documentation/_device_detection__features__performance_options.html
// https://51degrees.com/documentation/_features__automatic_datafile_updates.html
// https://51degrees.com/documentation/_features__usage_sharing.html
.SetPerformanceProfile(PerformanceProfiles.LowMemory)
// Inhibit sharing usage for this example.
// In general, off line processing usage should NOT be shared back to 51Degrees.
Expand Down
6 changes: 3 additions & 3 deletions Examples/OnPremise/UpdateDataFile-Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
/// # License Key
/// In order to test this example you will need a 51Degrees Enterprise license which can be
/// purchased from our
/// <a href="http://51degrees.com/pricing">pricing page</a>. Look for our "Bigger" or
/// <a href="https://51degrees.com/pricing">pricing page</a>. Look for our "Bigger" or
/// "Biggest" options.
///
/// # Data Files
/// You can find out more about data files, licenses etc. at our (FAQ page)[http://51degrees.com/resources/faqs]
/// You can find out more about data files, licenses etc. at our (FAQ page)[https://51degrees.com/resources/faqs]
///
/// ## Enterprise Data File
/// Enterprise (fully-featured) data files are typically released by 51Degrees four days a week
Expand Down Expand Up @@ -338,7 +338,7 @@ private string CheckLicenseKey(string licenseKey, ILogger logger)
{
logger.LogError("In order to test this example you will need a 51Degrees " +
"Enterprise license which can be obtained on a trial basis or purchased " +
"from our pricing page http://51degrees.com/pricing. You must supply the " +
"from our pricing page https://51degrees.com/pricing. You must supply the " +
"license key as the second command line argument to this program, or as " +
$"an environment variable named '{Constants.LICENSE_KEY_ENV_VAR}'");
throw new ArgumentException("No license key available", nameof(licenseKey));
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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
</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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public void ConfigureServices(IServiceCollection services)
$"appsettings.json file. Also, note that the " +
$"free 'lite' data file is insufficient to run " +
$"this example. A paid-for file can be obtained " +
$"from http://51degrees.com/pricing.");
$"from https://51degrees.com/pricing.");
}
}
}
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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
</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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
</ItemGroup>

<ItemGroup>
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.4.2</Version>
<Version>4.4.3</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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.CloudRequestEngine" Version="4.4.3" />
<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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Engines.FiftyOne" Version="4.4.3" />
<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 @@ -60,8 +60,8 @@

<ItemGroup>
<PackageReference Include="FiftyOne.Common.TestHelpers" Version="4.4.1" />
<PackageReference Include="FiftyOne.Pipeline.Engines.TestHelpers" Version="4.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Engines.TestHelpers" Version="4.4.3" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
<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 @@ -128,7 +128,7 @@ private async Task VerifyExampleAsync<T>(
"These tests will not pass when using the free 'lite' " +
"data file that is included with the source code. " +
"A paid-for data file can be obtained from " +
"http://51degrees.com/pricing You can then configure " +
"https://51degrees.com/pricing You can then configure " +
"the DEVICE_DETECTION_DATAFILE environment variable " +
"with the full path to the file.");
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The Pipeline engines are written in C# and target .NET Standard 2.0.3.
Example and test projects mostly target .NET Core 3.1 though in some cases, projects are available
targeting other frameworks.

For runtime dependencies, see our [dependencies](http://51degrees.com/documentation/_info__dependencies.html) page.
For runtime dependencies, see our [dependencies](https://51degrees.com/documentation/_info__dependencies.html) page.
The [tested versions](https://51degrees.com/documentation/_info__tested_versions.html) page shows
the .NET versions that we currently test against. The software may run fine against other versions,
but additional caution should be applied.
Expand Down
2 changes: 1 addition & 1 deletion ci/common-ci
Submodule common-ci updated 1 files
+21 −47 release-config.json
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.4.2" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.3" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 1d072b1

Please sign in to comment.