Merge branch 'main' of https://github.com/windows-toolkit/Labs-IntelligentAPIs into main

Directory.Build.props

@@ -0,0 +1,24 @@
+<Project>
+
+  <PropertyGroup>
+    <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
+  </PropertyGroup>
+
+  <Import Project="$(RepositoryDirectory)Windows.Toolkit.Common.props" />
+
+  <PropertyGroup>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <IncludeContentInPack>false</IncludeContentInPack>
+    <TargetFramework>uap10.0.17763</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DebugType>Portable</DebugType>
+    <PackageOutputPath>bin\Package</PackageOutputPath>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
+
+</Project>

Directory.Build.targets

@@ -0,0 +1,20 @@
+<Project>
+
+  <ItemGroup>
+    <PackageReference Include="NuGet.Build.Tasks.Pack" Version="5.2.0" PrivateAssets="all" Pack="false" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CommonTags>$(CommonTags);UWP;WinML;ML</CommonTags>
+    <PackageTags Condition="'$(PackageTags)' != ''">$(CommonTags);$(PackageTags)</PackageTags>
+    <PackageTags Condition="'$(PackageTags)' == ''">$(CommonTags)</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup Condition="$(IsPackable)">
+    <None Include="$(RepositoryDirectory)nuget.png" Pack="true" PackagePath="\Icon.png" />
+    <None Include="$(RepositoryDirectory)License.md" Pack="true" PackagePath="\" />
+    <None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+</Project>

ImageClassifier/IntelligentAPI_ImageClassifier.csproj

@@ -1,31 +1,13 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <RootNamespace>IntelligentAPI.ImageClassification</RootNamespace>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <IncludeContentInPack>false</IncludeContentInPack>
-    <TargetFramework>uap10.0.17763</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>CommunityToolkit.Labs.Intelligent.ImageClassification</PackageId>
     <Description>
       This package performs Image Classification on an input image by using the SqueezeNet Onnx model.
     </Description>
-    <Version>0.0.22</Version>
-    <Authors>CommunityToolkit.Labs</Authors>
-    <DebugType>Portable</DebugType>
-    <PackageOutputPath>bin\Package</PackageOutputPath>
-    <PackageProjectUrl>https://github.com/CommunityToolkit/Labs-IntelligentAPIs</PackageProjectUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="NuGet.Build.Tasks.Pack" Version="5.2.0" PrivateAssets="all" Pack="false" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Version>0.0.23</Version>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\IntelligentAPI_ImageClassifier.rd.xml" />

ImageClassifier/Properties/AssemblyInfo.cs

@@ -9,7 +9,6 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

ObjectDetector/IntelligentAPI_ObjectDetector.csproj

@@ -1,31 +1,13 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <RootNamespace>IntelligentAPI.ObjectDetection</RootNamespace>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <IncludeContentInPack>false</IncludeContentInPack>
-    <TargetFramework>uap10.0.17763</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>CommunityToolkit.Labs.Intelligent.ObjectDetection</PackageId>
     <Description>
       This package performs Object Detection on an input image by using the YOLOv4 Onnx model.
     </Description>
-    <Version>0.0.8</Version>
-    <Authors>CommunityToolkit.Labs</Authors>
-    <DebugType>Portable</DebugType>
-    <PackageOutputPath>bin\Package</PackageOutputPath>
-    <PackageProjectUrl>https://github.com/CommunityToolkit/Labs-IntelligentAPIs</PackageProjectUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="NuGet.Build.Tasks.Pack" Version="5.2.0" PrivateAssets="all" Pack="false"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Version>0.0.9</Version>
   </PropertyGroup>
   <ItemGroup>
        <EmbeddedResource Include="Properties\IntelligentAPI_ObjectDetector.rd.xml" />

ObjectDetector/Properties/AssemblyInfo.cs

@@ -9,7 +9,6 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

README.md

@@ -67,7 +67,9 @@ Community Toolkit Labs is a place for rapidly prototyping ideas and gathering co
 ## Steps to clone the repo
 
 1. `git clone` the repo 
-2.  Open the .sln file in VS 2017 or newer
-3.  Set `IntelligentLabsTest` as the startup project.
-4.  Build the project and run!
+3.  Open the .sln file in VS 2017 or newer
+4.  Set `IntelligentLabsTest` as the startup project.
+5.  Build the project and run!
+
+Note: If you have the Windows machine learning code generator or [mlgen](https://marketplace.visualstudio.com/items?itemName=WinML.mlgen) extension on VS, please disable it for this project since all the code is already generated for you.
 

ThirdPartyNotices.txt

@@ -12,6 +12,10 @@ This project incorporates components from the projects listed below. The origina
 
 %% microsoft/Windows-Machine-Learning NOTICES AND INFORMATION BEGIN HERE
 =========================================
+MIT License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

Windows.Toolkit.Common.props

@@ -0,0 +1,31 @@
+<Project>
+
+  <PropertyGroup>
+    <Company>.NET Foundation</Company>
+    <Authors>Microsoft.Toolkit</Authors>
+    <Product>Community Toolkit Labs</Product>
+    <CommonTags>Windows;Community;Toolkit;WCT</CommonTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Copyright>(c) .NET Foundation and Contributors.  All rights reserved.</Copyright>
+    <PackageProjectUrl>https://github.com/CommunityToolkit/Labs-IntelligentAPIs</PackageProjectUrl>
+    <PackageReleaseNotes>https://github.com/CommunityToolkit/Labs-IntelligentAPIs/releases</PackageReleaseNotes>
+    <PackageIcon>Icon.png</PackageIcon>
+    <PackageIconUrl>https://raw.githubusercontent.com/CommunityToolkit/Labs-IntelligentAPIs/main/nuget.png</PackageIconUrl>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Features>Strict</Features>
+    <Nullable>Disable</Nullable>
+    <LangVersion>Latest</LangVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <IsPackable>true</IsPackable>
+    <IsPublishable>true</IsPublishable>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+</Project>