Skip to content

Commit

Permalink
Updated nuget package versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Canming Huang committed Sep 12, 2023
1 parent d988574 commit de8ffd7
Show file tree
Hide file tree
Showing 8 changed files with 201 additions and 177 deletions.
10 changes: 5 additions & 5 deletions Emgu.TF.Example/CVInterop.Lite/CVInterop.Lite.Net.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<Platforms>AnyCPU;x86;x64</Platforms>
</PropertyGroup>
Expand All @@ -18,10 +18,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Emgu.CV" Version="4.6.0.5131" />
<PackageReference Include="Emgu.CV.Bitmap" Version="4.6.0.5131" />
<PackageReference Include="Emgu.CV.runtime.windows" Version="4.6.0.5131" />
<PackageReference Include="Emgu.CV.UI" Version="4.6.0.5131" />
<PackageReference Include="Emgu.CV" Version="4.8.0.5324" />
<PackageReference Include="Emgu.CV.Bitmap" Version="4.8.0.5324" />
<PackageReference Include="Emgu.CV.runtime.windows" Version="4.8.0.5324" />
<PackageReference Include="Emgu.CV.UI" Version="4.8.0.5324" />
</ItemGroup>

<Import Project="..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Shared.projitems" Label="Shared" />
Expand Down
2 changes: 1 addition & 1 deletion Emgu.TF.Example/Inception.Console.Lite.NetCore/Inception.Console.Lite.NetCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AssemblyName>Inception.Console.Lite.NetCore</AssemblyName>
<Platforms>AnyCPU;x86;x64</Platforms>
Expand Down
2 changes: 1 addition & 1 deletion Emgu.TF.Example/Maui.Lite/Maui.Demo.Lite.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<!-- <ProjectReference Condition="!($([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android')" Include="..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Netstandard\Emgu.TF.Lite.Models.Netstandard.csproj" /> -->
<ProjectReference Include="..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Netstandard\Emgu.TF.Lite.Models.Netstandard.csproj" />

<PackageReference Include="Emgu.CV.runtime.maui.mini" Version="4.7.0.5276" />
<PackageReference Include="Emgu.CV.runtime.maui.mini" Version="4.8.0.5324" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>

Expand Down
16 changes: 1 addition & 15 deletions Emgu.TF.Example/Maui.Lite/ModelCheckerPage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,7 @@ private async void OnButtonClicked(Object sender, EventArgs args)
if (fileResult == null) //canceled
return;
String fileName = fileResult.FullPath;
/*
#if !(__ANDROID__ || __IOS__ || __MACOS__)
Microsoft.Win32.OpenFileDialog dialog = new Microsoft.Win32.OpenFileDialog();
dialog.Multiselect = false;
dialog.Title = "Select a TF Lite Model File";
if (dialog.ShowDialog() == false) //canceled
return;
string fileName = dialog.FileName;
#else
var fileResult = await Xamarin.Essentials.FilePicker.PickAsync(Xamarin.Essentials.PickOptions.Images);
if (fileResult == null) //canceled
return;
string fileName = fileResult.FullPath;
#endif
*/

SetEditorMessage(GetModelInfo(fileName), 600);

}
Expand Down
6 changes: 3 additions & 3 deletions Emgu.TF.Example/XamarinForms/XamarinForms.Lite.Android/XamarinForms.Lite.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms">
<Version>7.0.2</Version>
<Version>7.0.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.Win32.Primitives">
<Version>4.3.0</Version>
Expand Down Expand Up @@ -276,10 +276,10 @@
<Version>0.11.4</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.5</Version>
<Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2578</Version>
<Version>5.0.0.2612</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
7 changes: 3 additions & 4 deletions Emgu.TF.Example/XamarinForms/XamarinForms.Lite.WPF/XamarinForms.Lite.WPF.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2578" />
<PackageReference Include="WpfLightToolkit" Version="1.0.3">
</PackageReference>
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2612" />
<PackageReference Include="WpfLightToolkit" Version="1.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Netstandard\Emgu.TF.Lite.Models.Netstandard.csproj">
Expand Down
299 changes: 164 additions & 135 deletions Solution/CrossPlatform/Emgu.TF.Lite.CrossPlatform.sln
View file

Large diffs are not rendered by default.

36 changes: 23 additions & 13 deletions Solution/macos/Emgu.TF.Lite.Mac.sln
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
# Visual Studio Version 17
VisualStudioVersion = 17.7.34009.444
MinimumVisualStudioVersion = 10.0.40219.1
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.TF.Util.Shared", "..\..\Emgu.TF.Util\Emgu.TF.Util.Shared.shproj", "{98561642-5EC3-4244-BAF9-6876D9BA5527}"
EndProject
Expand All @@ -27,17 +27,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emgu.TF.Lite.Models.Mac", "..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Mac\Emgu.TF.Lite.Models.Mac.csproj", "{FF3D6E2C-3E0B-411C-A802-F61EE8A4829F}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\Emgu.TF.Example\XamarinForms\XamarinForms.Lite\XamarinForms.Lite.projitems*{26f4d7af-57b6-4d2d-9a1c-aafa757ddc4a}*SharedItemsImports = 13
..\..\Emgu.TF.Runtime\Emgu.TF.Lite.Runtime.Mac.projitems*{8519b2b8-e96b-47fd-a466-c6031d34aaab}*SharedItemsImports = 13
..\..\Emgu.Models\Emgu.Models.Shared.projitems*{8edce0c8-ba71-4396-9428-35d05877258c}*SharedItemsImports = 13
..\..\Emgu.TF.Lite\Emgu.TF.Lite.projitems*{8f587fb9-bba6-4c30-9329-8cbac7020fe0}*SharedItemsImports = 13
..\..\Emgu.TF.Util\Emgu.TF.Util.projitems*{98561642-5ec3-4244-baf9-6876d9ba5527}*SharedItemsImports = 13
..\..\Emgu.Models\Emgu.Models.Shared.projitems*{a5be7c8b-c4df-4cce-8640-d533df7d6892}*SharedItemsImports = 4
..\..\Emgu.TF.Example\XamarinForms\XamarinForms.Lite\XamarinForms.Lite.projitems*{a5be7c8b-c4df-4cce-8640-d533df7d6892}*SharedItemsImports = 4
..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Shared.projitems*{a5be7c8b-c4df-4cce-8640-d533df7d6892}*SharedItemsImports = 4
..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Shared.projitems*{e956dd26-1294-4731-8a90-c4cba9f291b6}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|iPhone = Debug|iPhone
Expand Down Expand Up @@ -158,6 +147,27 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2D73C022-CB13-4DE8-AD29-F2A971F78815}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\Emgu.TF.Runtime\Windows\Emgu.TF.Lite.Runtime.Windows.projitems*{0d7c99ea-3aae-4f45-9ba7-3b4af8313753}*SharedItemsImports = 13
..\..\Emgu.TF.Example\XamarinForms\XamarinForms.Lite\XamarinForms.Lite.projitems*{26f4d7af-57b6-4d2d-9a1c-aafa757ddc4a}*SharedItemsImports = 13
..\..\Emgu.TF.Runtime\Debian\Emgu.TF.Lite.Runtime.Debian.projitems*{7f80ae6a-bd36-45ba-a152-5d366bcf8570}*SharedItemsImports = 5
..\..\Emgu.TF.Runtime\Mac\Emgu.TF.Lite.Runtime.Mac.projitems*{7f80ae6a-bd36-45ba-a152-5d366bcf8570}*SharedItemsImports = 5
..\..\Emgu.TF.Runtime\Ubuntu\Emgu.TF.Lite.Runtime.Ubuntu.projitems*{7f80ae6a-bd36-45ba-a152-5d366bcf8570}*SharedItemsImports = 5
..\..\Emgu.TF.Runtime\Windows\Emgu.TF.Lite.Runtime.Windows.projitems*{7f80ae6a-bd36-45ba-a152-5d366bcf8570}*SharedItemsImports = 5
..\..\Emgu.TF.Runtime\Mac\Emgu.TF.Lite.Runtime.Mac.projitems*{8519b2b8-e96b-47fd-a466-c6031d34aaab}*SharedItemsImports = 13
..\..\Emgu.Models\Emgu.Models.Shared.projitems*{8edce0c8-ba71-4396-9428-35d05877258c}*SharedItemsImports = 13
..\..\Emgu.TF.Lite\Emgu.TF.Lite.Shared.projitems*{8f587fb9-bba6-4c30-9329-8cbac7020fe0}*SharedItemsImports = 13
..\..\Emgu.Models\Emgu.Models.Shared.projitems*{971a6e6a-e7d4-4ff6-931e-8a25d572161c}*SharedItemsImports = 5
..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Shared.projitems*{971a6e6a-e7d4-4ff6-931e-8a25d572161c}*SharedItemsImports = 5
..\..\Emgu.TF.Util\Emgu.TF.Util.Shared.projitems*{98561642-5ec3-4244-baf9-6876d9ba5527}*SharedItemsImports = 13
..\..\Emgu.TF.Example\XamarinForms\XamarinForms.Lite\XamarinForms.Lite.projitems*{a5be7c8b-c4df-4cce-8640-d533df7d6892}*SharedItemsImports = 4
..\..\Emgu.TF.Runtime\Mac\Emgu.TF.Lite.Runtime.Mac.projitems*{a5be7c8b-c4df-4cce-8640-d533df7d6892}*SharedItemsImports = 4
..\..\Emgu.TF.Lite\Emgu.TF.Lite.Shared.projitems*{c07f7fe3-3835-460d-b6c2-166250c03ac0}*SharedItemsImports = 5
..\..\Emgu.TF.Util\Emgu.TF.Util.Shared.projitems*{c07f7fe3-3835-460d-b6c2-166250c03ac0}*SharedItemsImports = 5
..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Shared.projitems*{e956dd26-1294-4731-8a90-c4cba9f291b6}*SharedItemsImports = 13
..\..\Emgu.Models\Emgu.Models.Shared.projitems*{ff3d6e2c-3e0b-411c-a802-f61ee8a4829f}*SharedItemsImports = 4
..\..\Emgu.TF.Lite.Models\Emgu.TF.Lite.Models.Shared.projitems*{ff3d6e2c-3e0b-411c-a802-f61ee8a4829f}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
$0.DotNetNamingPolicy = $1
Expand Down

0 comments on commit de8ffd7

Please sign in to comment.