Skip to content

Commit

Permalink
Merge pull request 7981 from hotfix/v4.4.14 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 Dec 8, 2022
2 parents a1c15a8 + ba4f2f0 commit 7942e4e
Show file tree
Hide file tree
Showing 15 changed files with 56 additions and 71 deletions.
17 changes: 1 addition & 16 deletions Examples/Cloud/Framework-Web/App_Data/51Degrees.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,7 @@
"PipelineOptions": {
"Elements": [
{
"BuilderName": "CloudRequestEngine",
// Obtain a resource key with the properties required to run this
// example for free: https://configure.51degrees.com/1QWJwHxl
"BuildParameters": {
"ResourceKey": "!!ENTER_YOUR_RESOURCE_KEY_HERE!!",
"CloudRequestOrigin": "51Degrees.example.com"
}
},
{
"BuilderName": "DeviceDetectionCloudEngine"
},
{
"BuilderName": "JavaScriptBuilderElement",
"BuildParameters": {
"Minify": true
}
"BuilderName": "JavaScriptBundlerElement"
}
],
"ClientSideEnabled": true
Expand Down
52 changes: 26 additions & 26 deletions Examples/Cloud/Framework-Web/Framework-Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,41 +44,41 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="FiftyOne.DeviceDetection, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.dll</HintPath>
<Reference Include="FiftyOne.DeviceDetection, Version=4.4.13.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.4.4.13\lib\netstandard2.0\FiftyOne.DeviceDetection.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.DeviceDetection.Cloud, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Cloud.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Cloud.dll</HintPath>
<Reference Include="FiftyOne.DeviceDetection.Cloud, Version=4.4.13.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Cloud.4.4.13\lib\netstandard2.0\FiftyOne.DeviceDetection.Cloud.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.DeviceDetection.Hash.Engine.OnPremise, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.dll</HintPath>
<Reference Include="FiftyOne.DeviceDetection.Hash.Engine.OnPremise, Version=4.4.13.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.13\lib\netstandard2.0\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.DeviceDetection.Shared, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Shared.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Shared.dll</HintPath>
<Reference Include="FiftyOne.DeviceDetection.Shared, Version=4.4.13.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Shared.4.4.13\lib\netstandard2.0\FiftyOne.DeviceDetection.Shared.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.8\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Core, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Core.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.Core.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Core, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Core.4.4.8\lib\netstandard2.0\FiftyOne.Pipeline.Core.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.Engines.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.4.4.8\lib\netstandard2.0\FiftyOne.Pipeline.Engines.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.FiftyOne.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.Engines.FiftyOne.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.FiftyOne.4.4.8\lib\netstandard2.0\FiftyOne.Pipeline.Engines.FiftyOne.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JavaScriptBuilder.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.JavaScriptBuilderElement.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JavaScriptBuilder.4.4.8\lib\netstandard2.0\FiftyOne.Pipeline.JavaScriptBuilderElement.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JsonBuilder.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.JsonBuilder.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JsonBuilder.4.4.8\lib\netstandard2.0\FiftyOne.Pipeline.JsonBuilder.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.4.4.7\lib\net461\FiftyOne.Pipeline.Web.Framework.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.4.4.8\lib\net461\FiftyOne.Pipeline.Web.Framework.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.Shared.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.Web.Shared.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.Shared.4.4.8\lib\netstandard2.0\FiftyOne.Pipeline.Web.Shared.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Extensions.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
Expand Down Expand Up @@ -380,9 +380,9 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
<Error Condition="!Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets'))" />
<Error Condition="!Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.13\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.13\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets'))" />
</Target>
<Import Project="..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets" Condition="Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" />
<Import Project="..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.13\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets" Condition="Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.13\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
24 changes: 12 additions & 12 deletions Examples/Cloud/Framework-Web/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<package id="bootstrap" version="3.4.1" 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.DeviceDetection" version="4.4.12" targetFramework="net472" />
<package id="FiftyOne.DeviceDetection.Cloud" version="4.4.12" targetFramework="net472" />
<package id="FiftyOne.DeviceDetection.Hash.Engine.OnPremise" version="4.4.12" targetFramework="net472" />
<package id="FiftyOne.DeviceDetection.Shared" version="4.4.12" targetFramework="net472" />
<package id="FiftyOne.Pipeline.CloudRequestEngine" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines.FiftyOne" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JavaScriptBuilder" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JsonBuilder" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web.Shared" version="4.4.7" targetFramework="net472" />
<package id="FiftyOne.DeviceDetection" version="4.4.13" targetFramework="net472" />
<package id="FiftyOne.DeviceDetection.Cloud" version="4.4.13" targetFramework="net472" />
<package id="FiftyOne.DeviceDetection.Hash.Engine.OnPremise" version="4.4.13" targetFramework="net472" />
<package id="FiftyOne.DeviceDetection.Shared" version="4.4.13" targetFramework="net472" />
<package id="FiftyOne.Pipeline.CloudRequestEngine" version="4.4.8" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.4.8" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.4.8" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines.FiftyOne" version="4.4.8" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JavaScriptBuilder" version="4.4.8" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JsonBuilder" version="4.4.8" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web" version="4.4.8" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web.Shared" version="4.4.8" targetFramework="net472" />
<package id="jQuery" version="3.4.1" targetFramework="net472" />
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net472" />
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net472" />
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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.13" />
</ItemGroup>
</Otherwise>
</Choose>
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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
</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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
</ItemGroup>

<Choose>
Expand All @@ -68,7 +68,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.13" />
</ItemGroup>
</Otherwise>
</Choose>
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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
</ItemGroup>

<Choose>
Expand All @@ -68,7 +68,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.13" />
</ItemGroup>
</Otherwise>
</Choose>
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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
</ItemGroup>

<Choose>
Expand All @@ -68,7 +68,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.13" />
</ItemGroup>
</Otherwise>
</Choose>
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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
</ItemGroup>

<Choose>
Expand All @@ -68,7 +68,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.13" />
</ItemGroup>
</Otherwise>
</Choose>
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.7" />
<PackageReference Include="FiftyOne.Pipeline.CloudRequestEngine" Version="4.4.8" />
<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.7" />
<PackageReference Include="FiftyOne.Pipeline.Engines.FiftyOne" Version="4.4.8" />
<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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
<PackageReference Include="FiftyOne.Pipeline.Engines.TestHelpers" Version="4.4.8" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
<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
2 changes: 1 addition & 1 deletion ci/common-ci
Submodule common-ci updated 1 files
+2 −71 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.7" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.8" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 7942e4e

Please sign in to comment.