Merge pull request #2 from CommunityToolkit/build-props

Switch common properties into centralized props/target files
2021-08-04 10:03:52 -07:00 · 2021-08-04 10:03:52 -07:00 · 13ede2a8eb
--- a/Directory.Build.props
+++ b/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>
--- a/Directory.Build.targets
+++ b/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>
--- a/ImageClassifier/IntelligentAPI_ImageClassifier.csproj
+++ b/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>
+    <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>
  </PropertyGroup>
  <ItemGroup>
    <EmbeddedResource Include="Properties\IntelligentAPI_ImageClassifier.rd.xml" />
--- a/ImageClassifier/Properties/AssemblyInfo.cs
+++ b/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("")]

--- a/ObjectDetector/IntelligentAPI_ObjectDetector.csproj
+++ b/ObjectDetector/IntelligentAPI_ObjectDetector.csproj
@ -1,10 +1,6 @@
 <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>
@ -12,20 +8,6 @@
      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>
  </PropertyGroup>
  <ItemGroup>
       <EmbeddedResource Include="Properties\IntelligentAPI_ObjectDetector.rd.xml" />
--- a/ObjectDetector/Properties/AssemblyInfo.cs
+++ b/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("")]

--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@ -5,13 +5,17 @@ Do Not Translate or Localize

 This project incorporates components from the projects listed below. The original copyright notices and the licenses under which the .NET Foundation received such components are set forth below. The .NET Foundation reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.

-1. SqueezeNet ONNX model (https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/SqueezeNetObjectDetection/UWP/cs/Assets/model.onnx) included in ImageClassifier/Assetsas model.onnx.
+1. SqueezeNet ONNX model (https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/SqueezeNetObjectDetection/UWP/cs/Assets/model.onnx) included in ImageClassifier/Assets as model.onnx.
 2. YOLOV4 ONNX model (https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/Tutorial%20Samples/YOLOv4ObjectDetection/YOLOv4ObjectDetection/Assets/Yolo.onnx) included in ObjectDetector/Assets as yolo.onnx
 3. microsoft/Windows-Machine-Learning commit eb8b8be from which some of the pre-processing and post-processing functions for object detection were used. 
 4. microsoft/Windows-Machine-Learning commit 593575a from which some of the pre-processing and post-processing functions for image classification were used.

 %% 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
--- a/Windows.Toolkit.Common.props
+++ b/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>
--- a/nuget.png
+++ b/nuget.png