Skip to content

Commit

Permalink
Merge pull request 7961 from hotfix/v4.4.13 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 6, 2022
2 parents b0d096a + f998ce9 commit a1c15a8
Show file tree
Hide file tree
Showing 32 changed files with 89 additions and 95 deletions.
24 changes: 0 additions & 24 deletions 51D.md

This file was deleted.

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

Expand Down
20 changes: 14 additions & 6 deletions Examples/Cloud/Framework-Web/Framework-Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@
<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>
<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>
<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>
<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>
<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>
Expand Down Expand Up @@ -289,12 +301,6 @@
<DependentUpon>Site.Master</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj">
<Project>{b085f69e-d9d9-43cd-83bf-dc881a9ed501}</Project>
<Name>FiftyOne.DeviceDetection.Cloud</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<Content Include="Scripts\jquery-3.4.1.slim.min.map" />
Expand Down Expand Up @@ -374,7 +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'))" />
</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')" />
<!-- 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
7 changes: 6 additions & 1 deletion Examples/Cloud/Framework-Web/packages.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net472" />
<package id="AspNet.ScriptManager.bootstrap" version="3.4.1" targetFramework="net472" />
<package id="AspNet.ScriptManager.jQuery" version="3.4.1" targetFramework="net472" />
<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" />
Expand All @@ -22,6 +26,7 @@
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net472" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net472" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
<package id="Microsoft.CSharp" version="4.7.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 @@ -58,8 +58,6 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion Examples/Cloud/Metadata-Console/Metadata-Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions Examples/Cloud/TAC-Console/TacLookup-Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

</Project>
18 changes: 12 additions & 6 deletions Examples/ExampleBase/FiftyOne.DeviceDetection.Examples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,16 @@
<PackageReference Include="YamlDotNet" Version="11.2.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>

<Choose>
<When Condition="$(TestExamples51D)=='True'">
<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
</ItemGroup>
</Otherwise>
</Choose>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

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

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
<ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
<ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,17 @@
<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>

<Choose>
<When Condition="$(TestExamples51D)=='True'">
<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
</ItemGroup>
</Otherwise>
</Choose>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,17 @@
<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>

<Choose>
<When Condition="$(TestExamples51D)=='True'">
<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
</ItemGroup>
</Otherwise>
</Choose>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand Down Expand Up @@ -59,9 +59,17 @@
<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>

<Choose>
<When Condition="$(TestExamples51D)=='True'">
<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
</ItemGroup>
</Otherwise>
</Choose>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,17 @@
<ItemGroup>
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>

<Choose>
<When Condition="$(TestExamples51D)=='True'">
<ItemGroup>
<ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
</ItemGroup>
</Otherwise>
</Choose>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion FiftyOne.DeviceDetection/device-detection-cxx
2 changes: 1 addition & 1 deletion ci/common-ci
Submodule common-ci updated 1 files
+35 −42 release-config.json
Loading

0 comments on commit a1c15a8

Please sign in to comment.