Version 0.5.0

bibigone · Aug 2, 2019 · 0044daf · 0044daf
1 parent f4c2a77
commit 0044daf
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 150 deletions.
diff --git a/K4AdotNet.Samples.BodyTrackingSpeedTest/K4AdotNet.Samples.BodyTrackingSpeedTest.csproj b/K4AdotNet.Samples.BodyTrackingSpeedTest/K4AdotNet.Samples.BodyTrackingSpeedTest.csproj
@@ -1,9 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\Product.props.in" />
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <Platforms>AnyCPU</Platforms>
+    <Description>Core .NET sample console application to measure speed of Body Tracking.</Description>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/K4AdotNet.Samples.Wpf.BodyTracker/K4AdotNet.Samples.Wpf.BodyTracker.csproj b/K4AdotNet.Samples.Wpf.BodyTracker/K4AdotNet.Samples.Wpf.BodyTracker.csproj
@@ -49,6 +49,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\ProductInfo.cs">
+      <Link>Properties\ProductInfo.cs</Link>
+    </Compile>
     <Compile Include="BackgroundTrackingLoop.cs" />
     <Compile Include="BodyFrameReadyEventArgs.cs" />
     <Compile Include="BodyIndexMapTransformation.cs" />

diff --git a/K4AdotNet.Samples.Wpf.BodyTracker/Properties/AssemblyInfo.cs b/K4AdotNet.Samples.Wpf.BodyTracker/Properties/AssemblyInfo.cs
@@ -1,55 +1,13 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// 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: AssemblyTitle("K4AdotNet.Samples.Wpf.BodyTracker")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("K4AdotNet.Samples.Wpf.BodyTracker")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyDescription("WPF sample application to demonstrate using of Body Tracking API.")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
 [assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
+    ResourceDictionaryLocation.None,
+    ResourceDictionaryLocation.SourceAssembly
 )]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/K4AdotNet.Samples.Wpf.Common/K4AdotNet.Samples.Wpf.Common.csproj b/K4AdotNet.Samples.Wpf.Common/K4AdotNet.Samples.Wpf.Common.csproj
@@ -43,6 +43,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\ProductInfo.cs">
+      <Link>Properties\ProductInfo.cs</Link>
+    </Compile>
     <Compile Include="ActualFpsCalculator.cs" />
     <Compile Include="AppBase.cs" />
     <Compile Include="BackgroundReadingLoop.cs" />

diff --git a/K4AdotNet.Samples.Wpf.Common/Properties/AssemblyInfo.cs b/K4AdotNet.Samples.Wpf.Common/Properties/AssemblyInfo.cs
@@ -1,55 +1,13 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// 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: AssemblyTitle("K4AdotNet.Samples.Wpf.Common")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("K4AdotNet.Samples.Wpf.Common")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyDescription("Common helper classes for WPF samples to avoid extreme code duplication in WPF samples.")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly:ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                             //(used if a resource is not found in the page,
-                             // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                      //(used if a resource is not found in the page,
-                                      // app, or any theme specific resource dictionaries)
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None,
+    ResourceDictionaryLocation.SourceAssembly
 )]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/K4AdotNet.Samples.Wpf.Viewer/K4AdotNet.Samples.Wpf.Viewer.csproj b/K4AdotNet.Samples.Wpf.Viewer/K4AdotNet.Samples.Wpf.Viewer.csproj
@@ -50,6 +50,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\ProductInfo.cs">
+      <Link>Properties\ProductInfo.cs</Link>
+    </Compile>
     <Compile Include="App.cs" />
     <Compile Include="MainModel.cs" />
     <Compile Include="ViewerModel.cs" />

diff --git a/K4AdotNet.Samples.Wpf.Viewer/Properties/AssemblyInfo.cs b/K4AdotNet.Samples.Wpf.Viewer/Properties/AssemblyInfo.cs
@@ -1,55 +1,13 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// 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: AssemblyTitle("K4AdotNet.Samples.Wpf.Viewer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("K4AdotNet.Samples.Wpf.Viewer")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyDescription("WPF sample application to demonstrate using of Sensor API and Record API.")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
 [assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
+    ResourceDictionaryLocation.None,
+    ResourceDictionaryLocation.SourceAssembly
 )]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/K4AdotNet.Tests.SensorTypesUnitTests/K4AdotNet.Tests.SensorTypesUnitTests.csproj b/K4AdotNet.Tests.SensorTypesUnitTests/K4AdotNet.Tests.SensorTypesUnitTests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\Product.props.in" />
+
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-
     <IsPackable>false</IsPackable>
-
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 

diff --git a/K4AdotNet.sln b/K4AdotNet.sln
@@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 - Solution Items", "0 - S
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		LICENSE = LICENSE
+		Product.props.in = Product.props.in
+		ProductInfo.cs = ProductInfo.cs
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -21,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 - Tests", "3 - Tests", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "K4AdotNet.Samples.BodyTrackingSpeedTest", "K4AdotNet.Samples.BodyTrackingSpeedTest\K4AdotNet.Samples.BodyTrackingSpeedTest.csproj", "{45AEA3B6-EB45-479A-8962-93AC42B6AA41}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "K4AdotNet.Tests.SensorTypesUnitTests", "K4AdotNet.Tests.SensorTypesUnitTests\K4AdotNet.Tests.SensorTypesUnitTests.csproj", "{4E37EEE5-15FD-46A8-A8AC-8A3C1DE48893}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "K4AdotNet.Tests.SensorTypesUnitTests", "K4AdotNet.Tests.SensorTypesUnitTests\K4AdotNet.Tests.SensorTypesUnitTests.csproj", "{4E37EEE5-15FD-46A8-A8AC-8A3C1DE48893}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "K4AdotNet.Samples.Wpf.Viewer", "K4AdotNet.Samples.Wpf.Viewer\K4AdotNet.Samples.Wpf.Viewer.csproj", "{28F1EB11-BDF2-464E-A9C4-92D624F32F42}"
 EndProject

diff --git a/K4AdotNet/K4AdotNet.csproj b/K4AdotNet/K4AdotNet.csproj
@@ -1,18 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\Product.props.in" />
+
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-    <Version>0.2.0</Version>
-    <Authors>bibigone</Authors>
-    <Company />
-    <Product>K4A.Net</Product>
-    <Copyright>Copyright (c) 2019</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/bibigone/k4a.net/blob/master/README.md</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/bibigone/k4a.net</RepositoryUrl>
-    <PackageTags>Kinect Azure .NET K4A Depth Sensor Body Tracking BodyTracking</PackageTags>
     <Platforms>AnyCPU</Platforms>
-    <Description>Three-in-one managed .NET library to work with Azure Kinect devices. It includes sensor API, recording and play back API, body tracking API. Compatible with .NET Standard 2.0 and .NET Framework 4.6.1 and later.</Description>
+    <Description>Three-in-one managed .NET library to work with Azure Kinect devices. It includes sensor API, recording and playback API, body tracking API. Compatible with .NET Standard 2.0 and .NET Framework 4.6.1 and later.</Description>
+    <PackageTags>Kinect Azure .NET K4A Depth Sensor Body Tracking BodyTracking</PackageTags>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 

diff --git a/K4AdotNet/K4AdotNet.xml b/K4AdotNet/K4AdotNet.xml
diff --git a/Product.props.in b/Product.props.in
@@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <Version>0.5.0</Version>
+    <AssemblyVersion>0.5.0.0</AssemblyVersion>
+    <PackageReleaseNotes>First public build. Stable enough to be used in pre-production projects.</PackageReleaseNotes>
+    <Authors>bibigone</Authors>
+    <Company />
+    <Product>K4A.Net</Product>
+    <Copyright>Copyright (c) 2019</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/bibigone/k4a.net/blob/master/README.md</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/bibigone/k4a.net</RepositoryUrl>
+  </PropertyGroup>
+</Project>
diff --git a/ProductInfo.cs b/ProductInfo.cs
@@ -0,0 +1,11 @@
+using System.Reflection;
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("K4A.Net")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("0.5.0.0")]
+[assembly: AssemblyFileVersion("0.5.0.0")]