From d7c656e8bc28fb7bab359d1368b56db8d21b342a Mon Sep 17 00:00:00 2001 From: dotMorten Date: Wed, 6 Nov 2019 22:17:25 -0800 Subject: [PATCH] CSharp project clean up 1. Move from packages.config to PackageReference 2. Disable optimization in debug builds so you can actually step through the sample code 3. Upgrade to 1.3.0 4. Add x86 configuration as that's now supported + remove AnyCPU configurations. --- .../1-AcquiringImages.csproj | 55 ++------- .../1 - AcquiringImages/1-AcquiringImages.sln | 6 + .../1 - AcquiringImages/packages.config | 8 -- .../2-TransformDepthToColor.csproj | 65 ++--------- .../2-TransformDepthToColor.sln | 6 + .../2 - TransformDepthToColor/packages.config | 8 -- .../3 - SegmentColor/3-SegmentColor.csproj | 55 ++------- .../3 - SegmentColor/3-SegmentColor.sln | 6 + .../csharp/3 - SegmentColor/packages.config | 8 -- .../4-CognitiveServices.csproj | 108 +++--------------- .../4-CognitiveServices.sln | 6 + .../4 - CognitiveServices/packages.config | 19 --- 12 files changed, 63 insertions(+), 287 deletions(-) delete mode 100644 build2019/csharp/1 - AcquiringImages/packages.config delete mode 100644 build2019/csharp/2 - TransformDepthToColor/packages.config delete mode 100644 build2019/csharp/3 - SegmentColor/packages.config delete mode 100644 build2019/csharp/4 - CognitiveServices/packages.config diff --git a/build2019/csharp/1 - AcquiringImages/1-AcquiringImages.csproj b/build2019/csharp/1 - AcquiringImages/1-AcquiringImages.csproj index 872794d8..ca2050c2 100644 --- a/build2019/csharp/1 - AcquiringImages/1-AcquiringImages.csproj +++ b/build2019/csharp/1 - AcquiringImages/1-AcquiringImages.csproj @@ -18,29 +18,6 @@ - - true - DEBUG;TRACE - full - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - AnyCPU - prompt - AllRules.ruleset - true - true - true - - - TRACE - true - pdbonly - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - AnyCPU - prompt - MinimumRecommendedRules.ruleset - true - true - @@ -61,7 +38,7 @@ MinimumRecommendedRules.ruleset true true - true + false bin\x86\Release\ @@ -79,7 +56,7 @@ bin\x64\Debug\ DEBUG;TRACE true - true + false full x64 prompt @@ -98,9 +75,6 @@ true - - packages\Microsoft.Azure.Kinect.Sensor.1.2.0-beta.0\lib\netstandard2.0\Microsoft.Azure.Kinect.Sensor.dll - packages\Microsoft.Rest.ClientRuntime.2.3.19\lib\net452\Microsoft.Rest.ClientRuntime.dll @@ -112,29 +86,17 @@ packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - - packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - - packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll @@ -197,7 +159,6 @@ Resources.Designer.cs Designer - SettingsSingleFileGenerator Settings.Designer.cs @@ -213,14 +174,12 @@ + + + 1.3.0 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/build2019/csharp/2 - TransformDepthToColor/2-TransformDepthToColor.sln b/build2019/csharp/2 - TransformDepthToColor/2-TransformDepthToColor.sln index 9ffe0a83..603caa1a 100644 --- a/build2019/csharp/2 - TransformDepthToColor/2-TransformDepthToColor.sln +++ b/build2019/csharp/2 - TransformDepthToColor/2-TransformDepthToColor.sln @@ -8,13 +8,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Debug|x64.ActiveCfg = Debug|x64 {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Debug|x64.Build.0 = Debug|x64 + {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Debug|x86.ActiveCfg = Debug|x86 + {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Debug|x86.Build.0 = Debug|x86 {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Release|x64.ActiveCfg = Release|x64 {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Release|x64.Build.0 = Release|x64 + {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Release|x86.ActiveCfg = Release|x86 + {4BB6C393-9003-4608-BD70-F3FDA26378AA}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build2019/csharp/2 - TransformDepthToColor/packages.config b/build2019/csharp/2 - TransformDepthToColor/packages.config deleted file mode 100644 index 7c3be7ea..00000000 --- a/build2019/csharp/2 - TransformDepthToColor/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/build2019/csharp/3 - SegmentColor/3-SegmentColor.csproj b/build2019/csharp/3 - SegmentColor/3-SegmentColor.csproj index c49e68aa..f4c70ed1 100644 --- a/build2019/csharp/3 - SegmentColor/3-SegmentColor.csproj +++ b/build2019/csharp/3 - SegmentColor/3-SegmentColor.csproj @@ -18,29 +18,6 @@ - - true - DEBUG;TRACE - full - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - AnyCPU - prompt - AllRules.ruleset - true - true - true - - - TRACE - true - pdbonly - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - AnyCPU - prompt - MinimumRecommendedRules.ruleset - true - true - @@ -61,7 +38,7 @@ MinimumRecommendedRules.ruleset true true - true + false bin\x86\Release\ @@ -79,7 +56,7 @@ bin\x64\Debug\ DEBUG;TRACE true - true + false full x64 prompt @@ -98,9 +75,6 @@ true - - packages\Microsoft.Azure.Kinect.Sensor.1.2.0-beta.0\lib\netstandard2.0\Microsoft.Azure.Kinect.Sensor.dll - packages\Microsoft.Rest.ClientRuntime.2.3.19\lib\net452\Microsoft.Rest.ClientRuntime.dll @@ -112,29 +86,17 @@ packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - - packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - - packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll @@ -197,7 +159,6 @@ Resources.Designer.cs Designer - SettingsSingleFileGenerator Settings.Designer.cs @@ -214,14 +175,12 @@ + + + 1.3.0 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - -