Skip to content

Commit

Permalink
Merged PR 7417: Merge branch 'feature/package-versions' to 'master'
Browse files Browse the repository at this point in the history
REF: Update FiftyOne.Pipeline dependency versions to 4.4.6
  • Loading branch information
Steve51D committed Jul 26, 2022
2 parents 12a393f + dc5d604 commit b88112d
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 37 deletions.
32 changes: 16 additions & 16 deletions Examples/Cloud/Framework-Web/Framework-Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,29 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.5\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.6\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Core, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Core.4.4.5\lib\netstandard2.0\FiftyOne.Pipeline.Core.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Core, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Core.4.4.6\lib\netstandard2.0\FiftyOne.Pipeline.Core.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.4.4.5\lib\netstandard2.0\FiftyOne.Pipeline.Engines.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.4.4.6\lib\netstandard2.0\FiftyOne.Pipeline.Engines.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.FiftyOne.4.4.5\lib\netstandard2.0\FiftyOne.Pipeline.Engines.FiftyOne.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.FiftyOne.4.4.6\lib\netstandard2.0\FiftyOne.Pipeline.Engines.FiftyOne.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JavaScriptBuilder.4.4.5\lib\netstandard2.0\FiftyOne.Pipeline.JavaScriptBuilderElement.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JavaScriptBuilder.4.4.6\lib\netstandard2.0\FiftyOne.Pipeline.JavaScriptBuilderElement.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JsonBuilder.4.4.5\lib\netstandard2.0\FiftyOne.Pipeline.JsonBuilder.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.JsonBuilder.4.4.6\lib\netstandard2.0\FiftyOne.Pipeline.JsonBuilder.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.4.4.5\lib\net461\FiftyOne.Pipeline.Web.Framework.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.4.4.6\lib\net461\FiftyOne.Pipeline.Web.Framework.dll</HintPath>
</Reference>
<Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.Shared.4.4.5\lib\netstandard2.0\FiftyOne.Pipeline.Web.Shared.dll</HintPath>
<Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.Shared.4.4.6\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
3 changes: 1 addition & 2 deletions Examples/Cloud/Framework-Web/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<system.web>
<compilation debug="true" targetFramework="4.7.2">
<assemblies>
<add assembly="netstandard, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=cc7b13ffcd2ddd51"/>
<add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
</assemblies>
</compilation>
<httpRuntime targetFramework="4.7.2" />
Expand Down
16 changes: 8 additions & 8 deletions Examples/Cloud/Framework-Web/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<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.Pipeline.CloudRequestEngine" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines.FiftyOne" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JavaScriptBuilder" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JsonBuilder" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web.Shared" version="4.4.5" targetFramework="net472" />
<package id="FiftyOne.Pipeline.CloudRequestEngine" version="4.4.6" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Core" version="4.4.6" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines" version="4.4.6" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Engines.FiftyOne" version="4.4.6" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JavaScriptBuilder" version="4.4.6" targetFramework="net472" />
<package id="FiftyOne.Pipeline.JsonBuilder" version="4.4.6" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web" version="4.4.6" targetFramework="net472" />
<package id="FiftyOne.Pipeline.Web.Shared" version="4.4.6" 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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
</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.4.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
</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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
</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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
</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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
</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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
</ItemGroup>

<ItemGroup>
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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.CloudRequestEngine" Version="4.4.6" />
<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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Engines.FiftyOne" Version="4.4.6" />
<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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Engines.TestHelpers" Version="4.4.6" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
<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 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.6-beta.1" />
<PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.6" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit b88112d

Please sign in to comment.